Skip to content
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

Have .asd files follow latest ASDF recommendations #11

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

Have .asd files follow latest ASDF recommendations #11

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
11 changes: 5 additions & 6 deletions cl-gpu.asd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@

;; Auto-detect CUDA
#-(or cuda (and ecl (not (and dffi dlopen))))
(load-system :cffi)
(load-system "cffi")

#-(or cuda (and ecl (not (and dffi dlopen))))
(when (ignore-errors (cffi:load-foreign-library '(:default "libcuda")) t)
(pushnew :cuda *features*))

;; System definition
(defsystem :cl-gpu
:defsystem-depends-on (:hu.dwim.asdf)
(defsystem "cl-gpu"
:defsystem-depends-on ("hu.dwim.asdf")
:class "hu.dwim.asdf:hu.dwim.system"
:author ("Alexander Gavrilov <[email protected]>")
:licence "LLGPL"
:description "A library for writing GPU kernels in a subset of CL"
:depends-on (:cl-gpu.core
#+cuda :cl-gpu.cuda))
:depends-on ("cl-gpu.core"
#+cuda "cl-gpu.cuda"))
14 changes: 7 additions & 7 deletions cl-gpu.buffers.asd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
;;;
;;; See LICENCE for details.

(defsystem :cl-gpu.buffers
:defsystem-depends-on (:hu.dwim.asdf)
(defsystem "cl-gpu.buffers"
:defsystem-depends-on ("hu.dwim.asdf")
:class "hu.dwim.asdf:hu.dwim.system"
:author ("Alexander Gavrilov <[email protected]>")
:licence "LLGPL"
:description "A helper library that provides a generalized buffer interface."
:depends-on (:cffi
#+sbcl :sb-vector-io
:hu.dwim.util
:hu.dwim.def+contextl
:trivial-garbage)
:depends-on ("cffi"
#+sbcl "sb-vector-io"
"hu.dwim.util"
"hu.dwim.def+contextl"
"trivial-garbage")
:components ((:module "buffers"
:components ((:file "package")
(:file "utils" :depends-on ("package"))
Expand Down
4 changes: 2 additions & 2 deletions cl-gpu.core.asd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
;;;
;;; See LICENCE for details.

(defsystem :cl-gpu.core
:defsystem-depends-on (:hu.dwim.asdf)
(defsystem "cl-gpu.core"
:defsystem-depends-on ("hu.dwim.asdf")
:class "hu.dwim.asdf:hu.dwim.system"
:author ("Alexander Gavrilov <[email protected]>")
:licence "LLGPL"
Expand Down
12 changes: 5 additions & 7 deletions cl-gpu.cuda.asd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@
;;;
;;; See LICENCE for details.

(defsystem :cl-gpu.cuda
:defsystem-depends-on (:hu.dwim.asdf)
(defsystem "cl-gpu.cuda"
:defsystem-depends-on ("hu.dwim.asdf")
:class "hu.dwim.asdf:hu.dwim.system"
:author ("Alexander Gavrilov <[email protected]>")
:licence "LLGPL"
:description "CUDA integration for the GPU code translator."
:depends-on (:cl-gpu.core)
:depends-on ("cl-gpu.core")
:components ((:module "cuda"
:components ((:file "driver-lib")
(:file "driver-api" :depends-on ("driver-lib"))
(:file "pitched-copy" :depends-on ("driver-api"))
(:file "device-mem" :depends-on ("driver-api" "pitched-copy"))
(:file "nvcc")
(:file "target" :depends-on ("driver-api" "nvcc"))
(:file "module" :depends-on ("device-mem" "target" "nvcc"))))))

(defmethod perform :after ((o load-op) (c (eql (find-system :cl-gpu.cuda))))
(pushnew :cuda *features*))
(:file "module" :depends-on ("device-mem" "target" "nvcc")))))
:perform (load-op :after (o c) (pushnew :cuda *features*)))
8 changes: 4 additions & 4 deletions cl-gpu.test.asd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
;;;
;;; See LICENCE for details.

(defsystem :cl-gpu.test
:defsystem-depends-on (:hu.dwim.asdf)
(defsystem "cl-gpu.test"
:defsystem-depends-on ("hu.dwim.asdf")
:class "hu.dwim.asdf:hu.dwim.test-system"
:author ("Alexander Gavrilov <[email protected]>")
:licence "LLGPL"
:description "Test suite for cl-gpu"
:depends-on (:hu.dwim.stefil+hu.dwim.def
:cl-gpu)
:depends-on ("hu.dwim.stefil+hu.dwim.def"
"cl-gpu")
:components ((:module "test"
:components ((:file "utils" :depends-on ("package"))
(:file "buffers" :depends-on ("utils"))
Expand Down