Make changes to allow magicl to be compiled as a monolithic FASL bundle

magicl.asd

@@ -28,6 +28,7 @@
                #:abstract-classes
                #:policy-cond
                #:interface              ; for CALLING-FORM
+               #:cffi
                #:static-vectors
                #:trivial-garbage
                )
@@ -56,6 +57,7 @@
                  (:file "types/complex-single-float")
                  (:file "types/complex-double-float")
                  (:file "types/int32")
+                 (:file "types/specialized-vector")
                  (:file "constructors")
                  (:file "specialize-constructor")
                  (:file "polynomial-solver")))

src/extensions/blas/load-libs.lisp

@@ -1,26 +1,27 @@
 (in-package #:magicl.foreign-libraries)
 
-(cffi:define-foreign-library libblas
-  #+:magicl.use-accelerate
-  (:darwin "libBLAS.dylib" :search-path #P"/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/A/")
-  #-:magicl.use-accelerate
-  (:darwin (:or "/usr/local/opt/lapack/lib/libblas.dylib" "libblas.dylib" ))
-  #+:magicl.use-mkl
-  (:unix  "libmkl_rt.so")
-  #-:magicl.use-mkl
-  (:unix  (:or "libblas.so"
-               "libblas.so.3"))
-  (t (:default "libblas")))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (cffi:define-foreign-library libblas
+    #+:magicl.use-accelerate
+    (:darwin "libBLAS.dylib" :search-path #P"/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/A/")
+    #-:magicl.use-accelerate
+    (:darwin (:or "/usr/local/opt/lapack/lib/libblas.dylib" "libblas.dylib" ))
+    #+:magicl.use-mkl
+    (:unix  "libmkl_rt.so")
+    #-:magicl.use-mkl
+    (:unix  (:or "libblas.so"
+                 "libblas.so.3"))
+    (t (:default "libblas")))
 
-(pushnew 'libblas *foreign-libraries*)
-(export 'libblas)
+  (pushnew 'libblas *foreign-libraries*)
+  (export 'libblas)
 
-(defvar *blas-loaded* nil)
+  (defvar *blas-loaded* nil)
 
-(unless *blas-loaded*
-  (cffi:load-foreign-library 'libblas)
-  (setf *blas-loaded* t))
+  (unless *blas-loaded*
+    (cffi:load-foreign-library 'libblas)
+    (setf *blas-loaded* t))
 
-(magicl:define-backend :blas
-  :documentation "Backend for BLAS functionality written in Fortran."
-  :default t)
+  (magicl:define-backend :blas
+    :documentation "Backend for BLAS functionality written in Fortran."
+    :default t))

src/extensions/blas/package.lisp

@@ -1,4 +1,4 @@
-(defpackage #:magicl.blas-cffi
+(uiop:define-package #:magicl.blas-cffi
   (:use))
 
 (defpackage #:magicl.blas

src/extensions/common/package.lisp

@@ -13,7 +13,7 @@
            #:fortran-complex-double
            #:fortran-logical))
 
-(defpackage #:magicl.foreign-libraries
+(uiop:define-package #:magicl.foreign-libraries
   (:use #:common-lisp)
   (:export #:*foreign-libraries*
            #:track-symbols              ; used in MAGICL-GEN

src/extensions/expokit/load-libs.lisp

@@ -4,34 +4,32 @@
 
 (in-package #:magicl.foreign-libraries)
 
-(cffi:define-foreign-library libexpokit
-  (:darwin (:or "libexpokit.dylib" "expokit.dylib"))
-  (:unix  (:or "libexpokit.so" "expokit.so"))
-  (:windows (:or "libexpokit.dll" "expokit.dll"))
-  (t (:default "expokit")))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (cffi:define-foreign-library libexpokit
+    (:darwin (:or "libexpokit.dylib" "expokit.dylib"))
+    (:unix  (:or "libexpokit.so" "expokit.so"))
+    (:windows (:or "libexpokit.dll" "expokit.dll"))
+    (t (:default "expokit")))
 
-(pushnew 'libexpokit *foreign-libraries*)
+  (pushnew 'libexpokit *foreign-libraries*)
 
 
-(pushnew (first (asdf:output-files 'asdf:compile-op
-                                   (asdf:find-component
-                                    (asdf:find-component "magicl/ext-expokit" "expokit")
-                                    "expokit")))
-         cffi:*foreign-library-directories*
-         :test #'equal)
+  (pushnew (asdf:apply-output-translations (asdf:system-relative-pathname "magicl" "expokit"))
+           cffi:*foreign-library-directories*
+           :test #'equal)
 
-;; Keep above in sync with 'perform ((... compile-op) (... f->so))'
-;; method in magicl.asd.
+  ;; Keep above in sync with 'perform ((... compile-op) (... f->so))'
+  ;; method in magicl.asd.
 
 
-(export 'libexpokit)
+  (export 'libexpokit)
 
-(defvar *expokit-libs-loaded* nil)
+  (defvar *expokit-libs-loaded* nil)
 
-(unless *expokit-libs-loaded*
-  (cffi:load-foreign-library 'libexpokit)
-  (setf *expokit-libs-loaded* t))
+  (unless *expokit-libs-loaded*
+    (cffi:load-foreign-library 'libexpokit)
+    (setf *expokit-libs-loaded* t))
 
-(magicl:define-backend :expokit
-  :documentation "Functions available from Expokit."
-  :default t)
+  (magicl:define-backend :expokit
+    :documentation "Functions available from Expokit."
+    :default t))