Fixes techascent/tech.ml.dataset#437

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Time for a ChangeLog!
+
 ## 2.026 - UNRELEASED
  * Faster string conversion from c->jvm for large strings.
 

deps.edn

@@ -1,6 +1,6 @@
 {:paths ["src"]
  :deps {org.clojure/clojure     {:mvn/version "1.11.1" :scope "provided"}
-        cnuernber/dtype-next    {:mvn/version "10.111"}
+        cnuernber/dtype-next    {:mvn/version "10.124"}
         net.java.dev.jna/jna    {:mvn/version "5.12.1"}
         org.clojure/data.json   {:mvn/version "1.0.0"}
         ;;Replace me with caffeine...

src/libpython_clj2/python.clj

@@ -413,7 +413,7 @@ user> (py/py. np linspace 2 3 :num 10)
   (cond
     (instance? IFn pyobj)
     true
-    (dtype-ffi/convertible-to-pointer? pyobj)
+    (py-ffi/convertible-to-pointer? pyobj)
     (py-ffi/with-gil
       (let [retval (long (py-ffi/PyCallable_Check pyobj))]
         (case retval

src/libpython_clj2/python/base.clj

@@ -80,13 +80,13 @@
 (extend-type Object
   py-proto/PCopyToJVM
   (->jvm [item options]
-    (if (dt-ffi/convertible-to-pointer? item)
+    (if (py-ffi/convertible-to-pointer? item)
       (py-proto/pyobject->jvm item options)
       ;;item is already a jvm object
       item))
   py-proto/PBridgeToJVM
   (as-jvm [item options]
-    (if (dt-ffi/convertible-to-pointer? item)
+    (if (py-ffi/convertible-to-pointer? item)
       (py-proto/pyobject-as-jvm item options)
       item))
   py-proto/PPyCallable

src/libpython_clj2/python/bridge_as_jvm.clj

@@ -179,7 +179,7 @@
          (get-attr [item# item-name#]
            (with-gil
              (-> (py-proto/get-attr @pyobj*# item-name#)
-                 py-base/as-jvm)))
+                 (py-base/as-jvm))))
          (set-attr! [item# item-name# item-value#]
            (with-gil
              (py-ffi/with-decref [item-value# (py-ffi/untracked->python
@@ -225,7 +225,7 @@
                  (py-base/->jvm (py-fn/call-attr @pyobj*# "__str__" nil))))))
          (equals [this# other#]
            (boolean
-            (when (dt-ffi/convertible-to-pointer? other#)
+            (when (py-ffi/convertible-to-pointer? other#)
               (py-base/equals? @pyobj*# other#))))
          (hashCode [this#]
            (.hashCode ^Object (py-base/hash-code this#)))

src/libpython_clj2/python/ffi.clj

@@ -323,6 +323,16 @@ Each call must be matched with PyGILState_Release"}
            :pyobject [{:name :ob_refcnt :datatype (ffi-size-t/size-t-type)}
                       {:name :ob_type :datatype (ffi-size-t/size-t-type)}])))
 
+
+(defn convertible-to-pointer?
+  "Older definition - excludes Long objects which were made convertible-to-pointer
+  in later versions of dtype-next."
+  [d]
+  (boolean 
+   (when-not (instance? Long d)
+     (dt-ffi/convertible-to-pointer? d))))
+
+
 (defn pytype-offset
   ^long []
   (first (dt-struct/offset-of @pyobject-struct-type* :ob_type)))