>From df6cb9db6cf2e8b98220138b2c32526cbce3fb89 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 10:17:25 +0200 Subject: [PATCH 5/8] gnu: ocl-icd: Replace with opencl-icd-loader. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 | 4 ++-- 4 files changed, 11 insertions(+), 44 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b3a6d7bb4d..1f71c7a054 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10184,7 +10184,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 e550e979e5..7504d33d01 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 bf51e6885f..9a059b728c 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 fe85eaa642..88dd263677 100644 --- a/gnu/packages/rocm.scm +++ b/gnu/packages/rocm.scm @@ -270,7 +270,7 @@ allows runtimes to work on Windows as well as on Linux without much effort.") (patches (search-patches "rocm-opencl-runtime-3.10.0-add-rocclr-include-directories.patch" - ;; Do not install libOpenCL, which ocl-icd provides. + ;; Do not install libOpenCL, which opencl-icd-loader provides. "rocm-opencl-runtime-4.3-noopencl.patch" ;; Guix includes a program clinfo already. "rocm-opencl-runtime-4.3-noclinfo.patch" @@ -296,7 +296,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 `()) (home-page "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime") -- 2.31.1