Adding back in java library path shenanigans

cnuernber · cnuernber · commit e72eeda62e15 · 2021-03-08T11:44:40.000-07:00
diff --git a/project.clj b/project.clj
@@ -5,7 +5,7 @@
             :url  "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure    "1.10.2" :scope "provided"]
                  [camel-snake-kebab      "0.4.0"]
-                 [cnuernber/dtype-next   "6.07"]
+                 [cnuernber/dtype-next   "6.08"]
                  [net.java.dev.jna/jna "5.7.0"]
                  [org.clojure/data.json  "1.0.0"]]
   :profiles {:dev {:dependencies [[criterium "0.4.5"]
diff --git a/scripts/conda-repl b/scripts/conda-repl
@@ -7,6 +7,5 @@ source activate pyclj
 export LD_LIBRARY_PATH="$(python3-config --prefix)/lib"
 
 lein update-in :dependencies conj \[nrepl\ \"0.6.0\"\]\
-     -- update-in :plugins conj \[cider/cider-nrepl\ \"0.22.4\"\]\
+     -- update-in :plugins conj \[cider/cider-nrepl\ \"0.25.5\"\]\
      -- repl :headless :host localhost
-
diff --git a/scripts/py38-repl b/scripts/py38-repl
@@ -1,6 +1,5 @@
 #!/bin/bash
 
 lein update-in :dependencies conj \[nrepl\ \"0.6.0\"\]\
-     -- update-in :plugins conj \[cider/cider-nrepl\ \"0.22.4\"\]\
+     -- update-in :plugins conj \[cider/cider-nrepl\ \"0.25.5\"\]\
      -- repl :headless :host localhost
-
diff --git a/src/libpython_clj2/python.clj b/src/libpython_clj2/python.clj
@@ -72,6 +72,10 @@ user> (py/py. np linspace 2 3 :num 10)
                  (= 1 (py-ffi/Py_IsInitialized)))
     (let [info (py-info/detect-startup-info options)
           _ (log/infof "Startup info %s" info)
+          _ (when-let [lib-path (:java-library-path-addendum
+                                 options (:java-library-path-addendum info))]
+              (log/infof "Prefixing java library path: %s" lib-path)
+              (py-ffi/append-java-library-path! lib-path))
           libname (->> (concat (when library-path [library-path]) (:libnames info))
                        (dechunk-map identity)
                        (filter #(try
@@ -86,7 +90,10 @@ user> (py/py. np linspace 2 3 :num 10)
        libname (:python-home info)
        (assoc options
               :program-name (:program-name options (:executable info))
-              :python-home (:python-home options (:python-home info))))
+              :python-home (:python-home options (:python-home info))
+              :java-library-path-addendum (:java-library-path-addendum
+                                           options
+                                           (:java-library-path-addendum info))))
 
       (when-not (nil? windows-anaconda-activate-bat)
         (win/setup-windows-conda! windows-anaconda-activate-bat
diff --git a/src/libpython_clj2/python/ffi.clj b/src/libpython_clj2/python/ffi.clj
@@ -531,6 +531,16 @@ Each call must be matched with PyGILState_Release"}
   @format-exc-pyfn*)
 
 
+(defn append-java-library-path!
+  [new-search-path]
+  (let [existing-paths (-> (System/getProperty "java.library.path")
+                           (s/split #":"))]
+    (when-not (contains? (set existing-paths) new-search-path)
+      (let [new-path-str (s/join ":" (concat [new-search-path]
+                                             existing-paths))]
+        (System/setProperty "java.library.path" new-path-str)))))
+
+
 (defn initialize!
   [libpath python-home & [{:keys [signals? program-name python-home]
                            :or {signals? true
diff --git a/src/libpython_clj2/python/info.clj b/src/libpython_clj2/python/info.clj
@@ -73,7 +73,7 @@ print(json.dumps(
 
 
 (defn java-library-path-addendum
-  [system-info & [{:keys [python-home]}]]
+  [python-home]
   (when python-home
     (-> (Paths/get python-home
                    (into-array String ["lib"]))
@@ -87,7 +87,7 @@ print(json.dumps(
     (log/info "Detecting startup info"))
   (let [system-info (find-python-info options)
         python-home (find-python-home system-info options)
-        java-lib-path (java-library-path-addendum system-info options)
+        java-lib-path (java-library-path-addendum python-home)
         [ver-maj ver-med _ver-min] (:version system-info)
         lib-version                (format "%s.%s" ver-maj ver-med)
         libname                    (or library-path
