Unreleased but updated version to support graal native static compilation.

cnuernber · cnuernber · commit 29ba5fc262e5 · 2021-03-22T10:02:25.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Time for a ChangeLog!
 
+## 2.00-beta-13
+ * Update to dtype-next to support graal native static ffi and library generation.
+ * Update to dtype-next to have correct definitions of ptr-t, offset-t, and size-t types.
+
 ## 2.00-beta-12
  * Small refinements around embedding and documentation.
 
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 "6.12"}
+        cnuernber/dtype-next {:mvn/version "6.23"}
         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/ffi.clj b/src/libpython_clj2/python/ffi.clj
@@ -80,6 +80,7 @@ Required for some python modules"}
    :PyGILState_Ensure {:rettype :int32
                        :requires-gil? false
                        :doc "Ensure this thread owns the python GIL.
+
 Each call must be matched with PyGILState_Release"}
    :PyGILState_Check {:rettype :int32
                       :requires-gil? false
@@ -291,7 +292,17 @@ Each call must be matched with PyGILState_Release"}
    })
 
 
-(def python-lib-def* (delay (dt-ffi/define-library python-library-fns)))
+(def python-lib-def* (delay (dt-ffi/define-library
+                              python-library-fns
+                              ["_Py_NoneStruct"
+                               "_Py_FalseStruct"
+                               "_Py_TrueStruct"
+                               "PyType_Type"
+                               "PyExc_StopIteration"
+                               "PyRange_Type"
+                               "PyExc_Exception"]
+                              nil
+                              )))
 (defonce pyobject-struct-type*
   (delay (dt-struct/define-datatype!
            :pyobject [{:name :ob_refcnt :datatype (ffi-size-t/size-t-type)}
@@ -439,7 +450,7 @@ Each call must be matched with PyGILState_Release"}
 
 (defn- deref-ptr-ptr
   ^Pointer [^Pointer val]
-  (Pointer. (case (ffi-size-t/size-t-type)
+  (Pointer. (case (ffi-size-t/offset-t-type)
               :int32 (.getInt (native-buffer/unsafe) (.address val))
               :int64 (.getLong (native-buffer/unsafe) (.address val)))))
 
@@ -721,8 +732,8 @@ Each call must be matched with PyGILState_Release"}
 (defn pystr->str
   ^String [pyobj]
   ;;manually allocate/deallocate for speed; this gets called a lot
-  (let [size-obj (dt-ffi/make-ptr (ffi-size-t/size-t-type) 0 {:resource-type nil
-                                                              :uninitialized? true})
+  (let [size-obj (dt-ffi/make-ptr :pointer 0 {:resource-type nil
+                                              :uninitialized? true})
         ^Pointer str-ptr (PyUnicode_AsUTF8AndSize pyobj size-obj)
         nbuf (native-buffer/wrap-address (.address str-ptr)
                                          (size-obj 0)
