Skip to content

fix: ->jvm on object-dtype numpy arrays with np-array bindings #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsavyasachi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: ->jvm on object-dtype numpy arrays with np-array bindings #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/libpython_clj2/python/np_array.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,25 @@
:ctypes ctypes})))


(defn- zero-copyable-dtype?
"Object/str/datetime arrays hold python-object pointers, not a numeric native
buffer, so only the numeric dtypes in py-dtype->dtype-map can become a tensor."
[pyobj]
(py-ffi/with-gil
(let [dtype-name (-> (py-proto/get-attr pyobj "dtype")
(py-proto/get-attr "name"))]
(contains? py-dtype->dtype-map dtype-name))))


(defmethod py-proto/pyobject->jvm :ndarray
[pyobj opts]
(pygc/with-stack-context
(-> (numpy->desc pyobj)
(dtt/nd-buffer-descriptor->tensor)
(dtt/clone))))
(if (zero-copyable-dtype? pyobj)
(pygc/with-stack-context
(-> (numpy->desc pyobj)
(dtt/nd-buffer-descriptor->tensor)
(dtt/clone)))
;; non-numeric dtype (object/str/datetime): can't zero-copy, fall back to copy
((get-method py-proto/pyobject->jvm :default) pyobj opts)))


(defmethod py-proto/pyobject-as-jvm :ndarray
Expand Down
9 changes: 9 additions & 0 deletions test/libpython_clj2/numpy_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
(ns libpython-clj2.numpy-test
(:require [clojure.test :refer [deftest is]]
[libpython-clj2.python :as py]
;; loading these zero-copy bindings is what made object-dtype ->jvm fail
[libpython-clj2.python.np-array]
[tech.v3.datatype :as dtype]
[tech.v3.datatype.functional :as dfn]
[tech.v3.tensor :as dtt]))
Expand All @@ -18,3 +20,10 @@
(is (dfn/equals (dtt/ensure-tensor np-ary) tens))
(is (dfn/equals [1 2 3 4]
(dtype/make-container :java-array :int64 np-ary)))))


(deftest object-dtype-ndarray->jvm
(let [empty-obj (py/call-attr-kw np-mod "array" [[]] {:dtype "object"})
mixed-obj (py/call-attr-kw np-mod "array" [["a" 1]] {:dtype "object"})]
(is (= [] (py/->jvm empty-obj)))
(is (= ["a" 1] (py/->jvm mixed-obj)))))
Loading