[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
183/377: gnu: ocl-icd: Replace with opencl-icd-loader.
From: |
guix-commits |
Subject: |
183/377: gnu: ocl-icd: Replace with opencl-icd-loader. |
Date: |
Sun, 5 Sep 2021 10:07:40 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 4d1157fca7627c11672df0cd80fae4f4d27e2185
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Wed Aug 11 10:17:25 2021 +0200
gnu: ocl-icd: Replace with opencl-icd-loader.
ocl-icd’s project page is dead and the source code is unavailable.
* gnu/packages/opencl.scm (ocl-icd): Alias to opencl-icd-loader.
(clinfo)[inputs]: Use opencl-icd-loader.
(beignet)[inputs]: Dito.
(pocl)[inputs]: Dito.
(python-pyopencl)[inputs]: Dito.
* gnu/packages/games.scm (leela-zero)[inputs]: Dito.
* gnu/packages/photo.scm (darktable)[inputs]: Dito.
* gnu/packages/rocm.scm (rocm-opencl-runtime)[inputs]: Dito.
---
gnu/packages/games.scm | 2 +-
gnu/packages/opencl.scm | 44 +++++---------------------------------------
gnu/packages/photo.scm | 5 +++--
gnu/packages/rocm.scm | 2 +-
4 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index dd67931..07a61f2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10031,7 +10031,7 @@ remake of that series or any other game.")
`(("googletest" ,googletest)))
(inputs
`(("boost" ,boost)
- ("ocl-icd" ,ocl-icd)
+ ("opencl-icd-loader" ,opencl-icd-loader)
("openblas" ,openblas)
("opencl-headers" ,opencl-headers)
("qtbase" ,qtbase-5)
diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index e550e97..7504d33 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -159,41 +159,7 @@ This package contains the Khronos official OpenCL ICD
Loader.")
(license license:asl2.0)))
(define-public ocl-icd
- (package
- (name "ocl-icd")
- (version "2.2.12")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://forge.imag.fr/frs/download.php/836/ocl-icd-"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1x2dr8p4dkfds56r38av360i3nv1y3326jmshxvjngaf6mlg6rbn"))
- (modules '((guix build utils)))
- (snippet
- '(delete-file-recursively "khronos-headers"))))
- (native-inputs
- `(("opencl-headers" ,opencl-headers)
- ("ruby" ,ruby)))
- (inputs
- `(("libgcrypt" ,libgcrypt)))
- (build-system gnu-build-system)
- (arguments
- '(#:configure-flags '("DEBUG_OCL_ICD=1")))
- (native-search-paths
- (list (search-path-specification
- (variable "OPENCL_VENDOR_PATH")
- (files '("etc/OpenCL/vendors")))))
- (search-paths native-search-paths)
- (home-page "https://forge.imag.fr/projects/ocl-icd/")
- (synopsis "OpenCL loader for Installable Client Drivers (ICDs)")
- (description
- "OpenCL implementations are provided as ICDs (Installable Client
-Drivers). An OpenCL program can use several ICDs thanks to the use of an ICD
-Loader as provided by this package.")
- (license license:bsd-2)))
+ (deprecated-package "ocl-icd" opencl-icd-loader))
(define-public clinfo
(package
@@ -212,7 +178,7 @@ Loader as provided by this package.")
(native-inputs
`(("opencl-headers" ,opencl-headers)))
(inputs
- `(("ocl-icd" ,ocl-icd)))
+ `(("opencl-icd-loader" ,opencl-icd-loader)))
(arguments
`(#:make-flags
(list ,(string-append "CC=" (cc-for-target))
@@ -262,7 +228,7 @@ the system.")
("libxext" ,libxext)
("mesa-utils" ,mesa-utils)
("ncurses" ,ncurses)
- ("ocl-icd" ,ocl-icd)
+ ("opencl-icd-loader" ,opencl-icd-loader)
("opencl-headers" ,opencl-headers)
("xextproto" ,xextproto)
("zlib" ,zlib)))
@@ -329,7 +295,7 @@ back-end for the LLVM compiler framework.")
`(("clang" ,clang)
("hwloc" ,hwloc-2 "lib")
("llvm" ,llvm)
- ("ocl-icd" ,ocl-icd)))
+ ("opencl-icd-loader" ,opencl-icd-loader)))
(arguments
`(#:configure-flags
(list "-DENABLE_ICD=ON"
@@ -431,7 +397,7 @@ A lexer, @code{pytools.lex}.
(inputs
`(("opencl-headers" ,opencl-headers-1.2) ;POCL only supports OpenCL 1.2
("pybind11" ,pybind11)
- ("ocl-icd" ,ocl-icd))) ;libOpenCL
+ ("opencl-icd-loader" ,opencl-icd-loader)))
;libOpenCL
(propagated-inputs
`(("python-appdirs" ,python-appdirs)
("python-decorator" ,python-decorator)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index bf51e68..9a059b7 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -491,7 +491,8 @@ photographic equipment.")
;; Statically link to libOpenCL.
(substitute* "./src/common/dlopencl.c"
(("\"libOpenCL\"")
- (string-append "\"" (assoc-ref inputs "ocl-icd")
"/lib/libOpenCL.so\"")))
+ (string-append "\"" (assoc-ref inputs "opencl-icd-loader")
+ "/lib/libOpenCL.so\"")))
#t))
;; The use of inline is wrong and darktable cannot compile its kernels
;; with ROCm. See upstream commit
@@ -580,7 +581,7 @@ photographic equipment.")
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("lua" ,lua) ;optional, for plugins
- ("ocl-icd" ,ocl-icd) ;optional, for OpenCL support
+ ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support
("openexr" ,openexr) ;optional, for EXR import/export
("openjpeg" ,openjpeg) ;optional, for JPEG2000 export
("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view
diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm
index 66a28fc..05dbb00 100644
--- a/gnu/packages/rocm.scm
+++ b/gnu/packages/rocm.scm
@@ -297,7 +297,7 @@ allows runtimes to work on Windows as well as on Linux
without much effort.")
("rocm-comgr" ,rocm-comgr)
("rocr-runtime" ,rocr-runtime)
("rocclr" ,rocclr)
- ("ocl-icd" ,ocl-icd)
+ ("opencl-icd-loader" ,opencl-icd-loader)
("glew" ,glew)))
(native-inputs `())
(synopsis "ROCm OpenCL Runtime")
- 201/377: gnu: python-execnet: Update to 1.9.0 and enable tests., (continued)
- 201/377: gnu: python-execnet: Update to 1.9.0 and enable tests., guix-commits, 2021/09/05
- 203/377: gnu: python-mock: Update description., guix-commits, 2021/09/05
- 210/377: gnu: Add ansible-core., guix-commits, 2021/09/05
- 215/377: services: Remove i486 qemu target., guix-commits, 2021/09/05
- 88/377: gnu: Add r-ballgown., guix-commits, 2021/09/05
- 125/377: gnu: Add r-filehash., guix-commits, 2021/09/05
- 127/377: gnu: Add r-zooimage., guix-commits, 2021/09/05
- 148/377: gnu: Add rust-polars-arrow-0.15., guix-commits, 2021/09/05
- 155/377: gnu: rust-zstd-sys-1: Update to 1.6.1+zstd.1.5.0., guix-commits, 2021/09/05
- 178/377: gnu: man-pages: Update to 5.13., guix-commits, 2021/09/05
- 183/377: gnu: ocl-icd: Replace with opencl-icd-loader.,
guix-commits <=
- 185/377: gnu: python-pytools: Update to 2021.2.7., guix-commits, 2021/09/05
- 190/377: images: pinebook-pro: Fix the agetty baud rate., guix-commits, 2021/09/05
- 211/377: gnu: ansible: Update to 4.4.0., guix-commits, 2021/09/05
- 227/377: services: hurd-vm: Use the new 'targets' field of <bootloader-configuration>., guix-commits, 2021/09/05
- 235/377: gnu: Add python-pybbi., guix-commits, 2021/09/05
- 87/377: gnu: Add ivar., guix-commits, 2021/09/05
- 239/377: gnu: Add python-pytest-tornasync., guix-commits, 2021/09/05
- 247/377: gnu: Add python-coolbox., guix-commits, 2021/09/05
- 252/377: gnu: Add go-github-com-anaseto-gruid-tcell., guix-commits, 2021/09/05
- 253/377: gnu: harmonist: Update to 0.4.1., guix-commits, 2021/09/05