(address . guix-patches@gnu.org)
20210221063442.863940-1-milkeymouse@meme.institute
* gnu/packages/opencl.scm (opencl-headers): Update to 2020.12.18.
[version]: Use the latest tagged version, now that they exist.
[arguments]: Replace all phases with trivial header copy.
[license]: Change license to Apache 2.0 (happened in March 2020).
---
Several things have changed since the opencl-headers package was last
touched in 2018:
- OpenCL 3.0 was released: it's now the default in upstream ocl-headers
- The license was changed to Apache 2.0 as of commit 35deb75:
- Folder structure was changed: instead of separate folders for each
OpenCL version, there is one set of headers, and the chosen OpenCL
version can be selected by defining CL_TARGET_OPENCL_VERSION. The
opencl-headers packages with specific versions *could* modify the
headers by either wrapping each real header in one that first defines
CL_TARGET_OPENCL_VERSION to the desired OpenCL version, or using
unifdef(1) to remove the header altogether... but, building every
package that depends on opencl-headers or opencl-headers-*.*, they
all work fine with regular opencl-headers (they define for themselves
CL_TARGET_OPENCL_VERSION, or they work fine with default OpenCL 3.0)
so unless some out-of-tree package reallly needs a predefined wrapper
package just to #define CL_TARGET_OPENCL_VERSION 220, it's probably
OK to deprecate opencl-headers-2.2, opencl-headers-1.2, etc.
gnu/packages/opencl.scm | 68 ++++++++++++++++++-----------------------
1 file changed, 29 insertions(+), 39 deletions(-)
Toggle diff (96 lines)
diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index ddc30ef037..e95d19db47 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -20,6 +20,7 @@
(define-module (gnu packages opencl)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -47,44 +48,35 @@
;; tests that require such devices are all disabled.
;; Check https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00293.html
+(define-public opencl-headers
+ (package
+ (name "opencl-headers")
+ (version "2020.12.18")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/KhronosGroup/OpenCL-Headers")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zslxfzvbb1mrzmsik4pjzj88ds8y3p94ry5nnrnkhv6qm4n4lw9"))))
+ (build-system copy-build-system)
+ (arguments
+ '(#:install-plan
+ '(("CL" "include/")))) ; TODO: add phase for tests
+ (synopsis "The Khronos OpenCL headers")
+ (description
+ "This package provides the C headers by Khronos for OpenCL programming.")
+ (home-page "https://www.khronos.org/registry/OpenCL/")
+ (license license:asl2.0)))
+
(define (make-opencl-headers major-version subversion)
- (let ((commit "e986688daf750633898dfd3994e14a9e618f2aa5")
- (revision "0"))
- (package
- (name "opencl-headers")
- (version (git-version
- (string-append major-version "." subversion ".0")
- revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/KhronosGroup/OpenCL-Headers")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "176ydpbyws5nr4av6hf8p41pkhc0rc4m4vrah9w6gp2fw2i32838"))))
- (build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (delete 'check)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (copy-recursively (string-append "./opencl" (string-append
- ,major-version
- ,subversion) "/CL")
- (string-append
- (assoc-ref outputs "out")
- "/include/CL")))))))
- (synopsis "The Khronos OpenCL headers")
- (description
- "This package provides the C headers by Khronos for OpenCL
-programming.")
- (home-page "https://www.khronos.org/registry/OpenCL/")
- (license license:expat))))
+ ;; The upstream OpenCL-Headers repository is no longer separating headers by
+ ;; version; instead, you are supposed to #define CL_TARGET_OPENCL_VERSION.
+ (deprecated-package (string-append "opencl-headers-"
+ major-version "."
+ subversion) opencl-headers))
(define-public opencl-headers-2.2
(make-opencl-headers "2" "2"))
@@ -99,8 +91,6 @@ programming.")
(define-public opencl-headers-1.0
(make-opencl-headers "1" "0"))
-(define-public opencl-headers opencl-headers-2.2)
-
(define-public opencl-clhpp
(package
(name "opencl-clhpp")
--
2.30.1