Fixes #157

cnuernber · cnuernber · commit c58e9af6fc61 · 2021-04-09T13:39:03.000-06:00
diff --git a/deps.edn b/deps.edn
@@ -1,7 +1,7 @@
 {:paths ["src"]
  :deps {org.clojure/clojure  {:mvn/version "1.10.2" :scope "provided"}
         camel-snake-kebab/camel-snake-kebab    {:mvn/version "0.4.0"}
-        cnuernber/dtype-next {:mvn/version "7.01"}
+        cnuernber/dtype-next {:mvn/version "7.07"}
         net.java.dev.jna/jna {:mvn/version "5.7.0"}
         org.clojure/data.json  {:mvn/version "1.0.0"}}
 
diff --git a/src/libpython_clj2/python/bridge_as_jvm.clj b/src/libpython_clj2/python/bridge_as_jvm.clj
@@ -196,12 +196,16 @@
                (py-proto/set-item! @pyobj*# item-name# item-value#))))
          py-proto/PyCall
          (call [callable# arglist# kw-arg-map#]
-           (-> (py-fn/call-py-fn @pyobj*# arglist# kw-arg-map# py-base/->python)
-               (py-base/as-jvm)))
+           (with-gil
+             (-> (py-fn/call-py-fn @pyobj*# arglist# kw-arg-map# py-base/->python)
+                 (py-base/as-jvm))))
          (marshal-return [callable# retval#]
-           (py-base/as-jvm retval#))
+           (with-gil
+             (py-base/as-jvm retval#)))
          clj-proto/Datafiable
-         (datafy [callable#] (py-proto/pydatafy callable#))
+         (datafy [callable#]
+           (with-gil
+             (py-proto/pydatafy callable#)))
          Object
          (toString [this#]
            (with-gil
diff --git a/src/libpython_clj2/python/ffi.clj b/src/libpython_clj2/python/ffi.clj
@@ -370,8 +370,11 @@ Each call must be matched with PyGILState_Release"}
 ;;When this is true, generated functions will throw an exception if called when the
 ;;GIL is not captured.  It makes sense to periodically enable this flag in order
 ;;to ensure we aren't getting away with sneaky non-GIL access to Python.
-(def enable-api-gilcheck false)
+(def enable-api-gilcheck* (atom false))
 
+(defn enable-gil-check!
+  ([] (reset! enable-api-gilcheck* true))
+  ([value] (reset! enable-api-gilcheck* (boolean value))))
 
 (defn- find-pylib-fn
   [fn-kwd]
@@ -409,7 +412,7 @@ Each call must be matched with PyGILState_Release"}
            (let [fn-symbol (symbol (name fn-name))
                  requires-resctx? (first (filter #(= :string %)
                                                  (map second argtypes)))
-                 gilcheck? (when enable-api-gilcheck
+                 gilcheck? (when @enable-api-gilcheck*
                              (if (contains? fn-data :requires-gil?)
                                (fn-data :requires-gil?)
                                true))]
diff --git a/test/libpython_clj2/python_test.clj b/test/libpython_clj2/python_test.clj
@@ -14,6 +14,7 @@
 
 
 (py/initialize!)
+(py-ffi/enable-gil-check!)
 ;; Useful to see how many times we convert a string to a python object.
 ;; (dt-ffi/enable-string->c-stats!)
 ;; (.addShutdownHook (Runtime/getRuntime) (Thread.
@@ -386,8 +387,19 @@ class Foo:
 
 (deftest numpy-all
   (let [np (py/import-module "numpy")]
-    (is (= true (py/call-attr np "all" (py/call-attr np "array" [true true true]))))
-    (is (= false (py/call-attr np "all" (py/call-attr np "array" [true false true]))))))
+    (is (= true (py/call-attr np "all"
+                              (py/call-attr np "array" [true true true]))))
+    (is (= false (py/call-attr np "all"
+                               (py/call-attr np "array" [true false true]))))))
+
+
+(deftest np-dot
+  (let [np (py/import-module "numpy")
+        np-dot (py/get-attr np "dot")
+        np-ary (py/call-attr np "array" [1 2 3])]
+    (is (== 14 (np-dot np-ary np-ary)))))
+
+
 
 
 (comment
