Tech.resource 5.x (#132)

cnuernber · web-flow · commit 06298ff1e645 · 2020-10-24T14:09:19.000-06:00
* Another large change, needs some careful consideration.

* Moved to tech.v3.jna as an issue in tech.resource was found.

* removed unused requires.

* Updating readme.
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@
  - Note - Please avoid deprecated versions such as `[cnuernber/libpython-clj "1.36"]` (***note name change***).
  
  * [API Documentation](https://clj-python.github.io/libpython-clj/)
+ * This library, which has received the efforts of many excellent people, is built mainly upon
+   [cnuernber/dtype-next](https://github.com/cnuernber/dtype-next/) and 
+   [techascent/tech.jna](https://github.com/techascent/tech.jna).  It supports zerocopy transfer
+   of data to/from numpy, dynamically creating Clojure namespaces from Python modules, and has
+   a deep intergration with the Clojure language.
 
 ## libpython-clj features
 
diff --git a/project.clj b/project.clj
@@ -5,8 +5,8 @@
             :url  "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure    "1.10.2-alpha2"]
                  [camel-snake-kebab      "0.4.0"]
-                 [cnuernber/dtype-next   "6.00-alpha-10"]
-                 [techascent/tech.jna    "3.24"]
+                 [cnuernber/dtype-next   "6.00-alpha-11"]
+                 [techascent/tech.jna    "4.02"]
                  [org.clojure/data.json  "1.0.0"]]
   :profiles {:dev {:dependencies [[criterium "0.4.5"]]}
              :codox
diff --git a/src/libpython_clj/jna/base.clj b/src/libpython_clj/jna/base.clj
@@ -1,6 +1,6 @@
 (ns libpython-clj.jna.base
-  (:require [tech.jna :as jna]
-            [tech.jna.base :as jna-base])
+  (:require [tech.v3.jna :as jna]
+            [tech.v3.jna.base :as jna-base])
   (:import [com.sun.jna Pointer NativeLibrary]
            [libpython_clj.jna PyObject]
            [java.util.concurrent.atomic AtomicLong]))
@@ -110,6 +110,6 @@
 
 
 (defn find-pylib-symbol
-  [sym-name]
+  ^Pointer [sym-name]
   (.getGlobalVariableAddress ^NativeLibrary (jna-base/load-library *python-library*)
                              sym-name))
diff --git a/src/libpython_clj/jna/concrete/cfunction.clj b/src/libpython_clj/jna/concrete/cfunction.clj
@@ -8,7 +8,7 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna CallbackReference Pointer Callback]
            [libpython_clj.jna
             CFunction$KeyWordFunction
diff --git a/src/libpython_clj/jna/concrete/dict.clj b/src/libpython_clj/jna/concrete/dict.clj
@@ -7,7 +7,7 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject DirectMapped]))
 
diff --git a/src/libpython_clj/jna/concrete/err.clj b/src/libpython_clj/jna/concrete/err.clj
@@ -8,10 +8,12 @@
                      find-pylib-symbol
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject PyTypeObject DirectMapped]))
 
+(set! *warn-on-reflection* true)
+
 
 (defn PyErr_Occurred
   "Check if the error indicator is set.  If so, return the exception type."
diff --git a/src/libpython_clj/jna/concrete/import.clj b/src/libpython_clj/jna/concrete/import.clj
@@ -6,8 +6,7 @@
                      ensure-pydict
                      size-t-type
                      *python-library*]
-             :as libpy-base]
-            [tech.jna :as jna])
+             :as libpy-base])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject]))
 
diff --git a/src/libpython_clj/jna/concrete/list.clj b/src/libpython_clj/jna/concrete/list.clj
@@ -7,7 +7,7 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject]))
 
diff --git a/src/libpython_clj/jna/concrete/module.clj b/src/libpython_clj/jna/concrete/module.clj
@@ -7,7 +7,7 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyModuleDef PyMethodDef PyObject]))
 
diff --git a/src/libpython_clj/jna/concrete/numeric/boolean.clj b/src/libpython_clj/jna/concrete/numeric/boolean.clj
@@ -5,8 +5,7 @@
                      ensure-pytuple
                      ensure-pydict
                      find-pylib-symbol]
-             :as libpy-base]
-            [tech.jna :as jna])
+             :as libpy-base])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject]))
 
diff --git a/src/libpython_clj/jna/concrete/numeric/complex.clj b/src/libpython_clj/jna/concrete/numeric/complex.clj
@@ -6,7 +6,7 @@
                      ensure-pydict
                      find-pylib-symbol]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyComplex PyComplex$ByValue
             PyObject]))
diff --git a/src/libpython_clj/jna/concrete/numeric/float.clj b/src/libpython_clj/jna/concrete/numeric/float.clj
@@ -5,8 +5,7 @@
                      ensure-pytuple
                      ensure-pydict
                      *python-library*]
-             :as libpy-base]
-            [tech.jna :as jna])
+             :as libpy-base])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject DirectMapped]))
 
diff --git a/src/libpython_clj/jna/concrete/numeric/integer.clj b/src/libpython_clj/jna/concrete/numeric/integer.clj
@@ -6,7 +6,7 @@
                      ensure-pydict
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject DirectMapped]))
 
diff --git a/src/libpython_clj/jna/concrete/set.clj b/src/libpython_clj/jna/concrete/set.clj
@@ -6,8 +6,7 @@
                      ensure-pydict
                      size-t-type
                      *python-library*]
-             :as libpy-base]
-            [tech.jna :as jna])
+             :as libpy-base])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject]))
 
diff --git a/src/libpython_clj/jna/concrete/tuple.clj b/src/libpython_clj/jna/concrete/tuple.clj
@@ -7,7 +7,7 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject DirectMapped]))
 
diff --git a/src/libpython_clj/jna/concrete/type.clj b/src/libpython_clj/jna/concrete/type.clj
@@ -7,7 +7,7 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyMethodDef PyTypeObject PyObject]))
 
diff --git a/src/libpython_clj/jna/concrete/unicode.clj b/src/libpython_clj/jna/concrete/unicode.clj
@@ -7,8 +7,9 @@
                      find-pylib-symbol
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna]
-            [tech.v3.datatype :as dtype])
+            [tech.v3.jna :as jna]
+            [tech.v3.datatype :as dtype]
+            [tech.v3.datatype.nio-buffer :as nio-buffer])
   (:import [com.sun.jna Pointer]
            [com.sun.jna.ptr PointerByReference
             LongByReference IntByReference]
@@ -27,7 +28,7 @@
   Signature:
   PyObject* (const char *s, Py_ssize_t size, const char *encoding, const char *errors)"
   ^Pointer [s size encoding errors]
-  (DirectMapped/PyUnicode_Decode (dtype/->nio-buffer s)
+  (DirectMapped/PyUnicode_Decode (nio-buffer/->nio-buffer s)
                                  (jna/size-t size)
                                  (str encoding)
                                  (str errors)))
diff --git a/src/libpython_clj/jna/interpreter.clj b/src/libpython_clj/jna/interpreter.clj
@@ -9,8 +9,7 @@
                      find-pylib-symbol
                      *python-library*]
              :as libpy-base]
-            [tech.jna.base :as jna-base]
-            [tech.jna :as jna]
+            [tech.v3.jna :as jna]
             [libpython-clj.jna.protocols.object :as pyobj]
             [libpython-clj.jna.concrete.unicode :as pyuni]
             [camel-snake-kebab.core :refer [->kebab-case]]
@@ -273,7 +272,7 @@
    the Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS macros is acceptable.
 
    The return value is an opaque “handle” to the thread state when PyGILState_Ensure()
-   was called, and must be passed to PyGILState_Release() to ensure Python is left in 
+   was called, and must be passed to PyGILState_Release() to ensure Python is left in
    the same state. Even though recursive calls are allowed, these handles cannot be shared -
    each unique call to PyGILState_Ensure() must save the handle for its call to PyGILState_Release().
 
diff --git a/src/libpython_clj/jna/protocols/buffer.clj b/src/libpython_clj/jna/protocols/buffer.clj
@@ -7,8 +7,8 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna]
-            [tech.v3.datatype :as dtype])
+            [tech.v3.jna :as jna]
+            [tech.v3.datatype.nio-buffer :as nio-buffer])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyBuffer]))
 
@@ -102,7 +102,7 @@
 
    This function fails if len != src->len."
   Integer
-  [buf dtype/as-nio-buffer]
+  [buf nio-buffer/as-nio-buffer]
   [src (partial jna/ensure-type PyBuffer)]
   [len jna/size-t]
   [order byte])
diff --git a/src/libpython_clj/jna/protocols/iterator.clj b/src/libpython_clj/jna/protocols/iterator.clj
@@ -6,8 +6,7 @@
                      ensure-pydict
                      size-t-type
                      *python-library*]
-             :as libpy-base]
-            [tech.jna :as jna])
+             :as libpy-base])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject]))
 
diff --git a/src/libpython_clj/jna/protocols/mapping.clj b/src/libpython_clj/jna/protocols/mapping.clj
@@ -6,8 +6,7 @@
                      ensure-pydict
                      size-t-type
                      *python-library*]
-             :as libpy-base]
-            [tech.jna :as jna])
+             :as libpy-base])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject]))
 
diff --git a/src/libpython_clj/jna/protocols/object.clj b/src/libpython_clj/jna/protocols/object.clj
@@ -8,8 +8,6 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna.base :as jna-base]
-            [tech.jna :as jna]
             [camel-snake-kebab.core :refer [->kebab-case]])
   (:import [com.sun.jna Pointer Native NativeLibrary]
            [com.sun.jna.ptr PointerByReference]
diff --git a/src/libpython_clj/jna/protocols/sequence.clj b/src/libpython_clj/jna/protocols/sequence.clj
@@ -7,7 +7,7 @@
                      size-t-type
                      *python-library*]
              :as libpy-base]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [libpython_clj.jna PyObject DirectMapped]))
 
diff --git a/src/libpython_clj/python.clj b/src/libpython_clj/python.clj
@@ -10,7 +10,7 @@
             [libpython-clj.jna :as libpy]
             ;;Protocol implementations purely for nd-ness
             [libpython-clj.python.np-array]
-            [tech.jna :as jna])
+            [tech.v3.jna :as jna])
   (:import [com.sun.jna Pointer]
            [com.sun.jna.ptr PointerByReference]
            [java.lang.reflect Field]
diff --git a/src/libpython_clj/python/bridge.clj b/src/libpython_clj/python/bridge.clj
@@ -42,11 +42,10 @@
               create-bridge-from-att-map]]
             [libpython-clj.python.gc :as pygc]
             [clojure.stacktrace :as st]
-            [tech.jna :as jna]
+            [tech.v3.jna :as jna]
             [tech.v3.tensor :as dtt]
             [tech.v3.datatype.protocols :as dtype-proto]
             [tech.v3.datatype.casting :as casting]
-            [tech.v3.datatype.functional :as dtype-fn]
             [tech.v3.datatype.argops :as argops]
             [tech.v3.datatype :as dtype]
             [clojure.set :as c-set]
diff --git a/src/libpython_clj/python/interop.clj b/src/libpython_clj/python/interop.clj
@@ -19,10 +19,10 @@
               conj-forever!]
              :as pyinterp]
             [clojure.stacktrace :as st]
-            [tech.jna :as jna]
+            [tech.v3.jna :as jna]
             ;;need memset
             [tech.v3.datatype.native-buffer :as native-buffer]
-            [tech.resource :as resource]
+            [tech.v3.resource :as resource]
             [libpython-clj.python.object
              :refer [wrap-pyobject incref-wrap-pyobject
                      incref
diff --git a/src/libpython_clj/python/interpreter.clj b/src/libpython_clj/python/interpreter.clj
@@ -4,7 +4,7 @@
             [libpython-clj.python.gc :as pygc]
             [libpython-clj.python.logging
              :refer [log-error log-warn log-info]]
-            [tech.jna :as jna]
+            [tech.v3.jna :as jna]
             [clojure.java.shell :refer [sh]]
             [clojure.java.io :as io]
             [clojure.string :as s]
@@ -464,9 +464,8 @@ print(json.dumps(
       (setup-direct-mapping!)
       ;;Set program name
       (when-let [program-name (or program-name executable "")]
-        (pygc/with-stack-context
-          (libpy/PySys_SetArgv 0 (-> program-name
-                                     (jna/string->wide-ptr))))))
+        (libpy/PySys_SetArgv 0 (-> program-name
+                                   (jna/string->wide-ptr)))))
     (let [type-symbols (libpy/lookup-type-symbols)
           context (do
                     (libpy-base/set-gil-thread-id!
diff --git a/src/libpython_clj/python/object.clj b/src/libpython_clj/python/object.clj
@@ -35,7 +35,7 @@
             [libpython-clj.jna :as libpy]
             [libpython-clj.python.gc :as pygc]
             [clojure.stacktrace :as st]
-            [tech.jna :as jna]
+            [tech.v3.jna :as jna]
             [tech.v3.datatype :as dtype]
             [tech.v3.datatype.protocols :as dtype-proto]
             [tech.v3.datatype.casting :as casting]
diff --git a/test/libpython_clj/classes_test.clj b/test/libpython_clj/classes_test.clj
@@ -1,8 +1,6 @@
 (ns libpython-clj.classes-test
   (:require [libpython-clj.python :as py]
-            [libpython-clj.jna :as pylib]
             [clojure.test :refer :all]
-            [clojure.pprint :as pp]
             [clojure.edn :as edn]))
 
 
diff --git a/test/libpython_clj/python_test.clj b/test/libpython_clj/python_test.clj
@@ -4,7 +4,7 @@
             [tech.v3.datatype :as dtype]
             [tech.v3.datatype.functional :as dfn]
             [tech.v3.tensor :as dtt]
-            [tech.jna :as jna]
+            [tech.v3.jna :as jna]
             [clojure.test :refer :all])
   (:import [java.io StringWriter]
            [java.util Map List]
diff --git a/test/libpython_clj/stress_test.clj b/test/libpython_clj/stress_test.clj
@@ -60,8 +60,6 @@ def getmultidata():
 ;;related things causes immediate failure.  Unless you feel like being pedantic,
 ;;this isn't necessary.  The python library automatically switches to normal gc-only
 ;;mode if a resource context is open.
-(alter-var-root #'tech.resource.stack/*resource-context*
-                (constantly nil))
 
 (deftest forever-test
   (doseq [items (take 10 (partition 999 (get-data)))]
