[fix] numpy-installed-p.txt and recompile manually

Making this into a non-lisp file avoids undefined variable warnings when the case of the readtable changes.
digikar99 · Apr 30, 2024 · 53402f3 · 53402f3
1 parent 4d09ece
commit 53402f3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/py4cl2-cffi.asd b/py4cl2-cffi.asd
@@ -35,7 +35,7 @@
                (:file "lisp-utils")
                (:static-file "py4cl-utils.c")
                (:static-file "py4cl-numpy-utils.c")
-               (:file "numpy-installed-p")
+               (:static-file "numpy-installed-p.txt")
                (:file "shared-objects")
                (:file "gil-gc")
                (:file "numpy")

diff --git a/src/numpy-installed-p.lisp b/src/numpy-installed-p.lisp
diff --git a/src/shared-objects.lisp b/src/shared-objects.lisp
@@ -48,22 +48,20 @@
                          (format nil "~{~a~^ ~}" *python-includes*)
                          (format nil "~A/core/include/"
                                  (string-trim (list #\newline) numpy-path)))))
-          (setq *numpy-installed-p* numpy-installed-p)
           (when numpy-installed-p
             (format t "~&~A~%" program-string)
             (uiop:run-program program-string
                               :error-output *error-output*
                               :output *standard-output*)))))))
 
 (eval-when (:compile-toplevel)
-  (compile-base-utils-shared-object)
-  (may-be-compile-numpy-utils-shared-object))
+  (compile-base-utils-shared-object))
 
 (eval-when (:compile-toplevel :load-toplevel)
   (let* ((numpy-installed-p-file
            (asdf:component-pathname
             (asdf:find-component
-             "py4cl2-cffi" "numpy-installed-p"))))
+             "py4cl2-cffi" "numpy-installed-p.txt"))))
     (multiple-value-bind (numpy-installed-p-old error)
           (ignore-errors
            (with-standard-io-syntax
@@ -74,15 +72,16 @@
                                                    :ignore-error-status t))))
              (numpy-installed-p-new
                (with-standard-io-syntax
-                 (write-to-string `(quote ,numpy-installed-p)))))
+                 (write-to-string numpy-installed-p))))
+        (setq *numpy-installed-p* numpy-installed-p)
         (when (or error
                   (string/= numpy-installed-p-old
                             numpy-installed-p-new))
           (with-standard-io-syntax
             (write-string-into-file numpy-installed-p-new numpy-installed-p-file
                                     :if-exists :supersede
-                                    :if-does-not-exist :create)))
-        (setq *numpy-installed-p* numpy-installed-p)))))
+                                    :if-does-not-exist :create))
+          (may-be-compile-numpy-utils-shared-object))))))
 
 (defvar *python-libraries-loaded-p* nil)
 (defun load-python-and-libraries ()