diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2019-11-12 18:17:29 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-11-15 17:52:45 +0100 |
| commit | 8c8e108978e0917415c863977b605b84dd01be52 (patch) | |
| tree | eccb94db95ae694bb2c805915a71f2a2162bdfe6 | |
| parent | 52cd164aadb3f0b6af4002aed9bebb56f97529bf (diff) | |
gnu: hwloc: Update to 2.1.0.
* gnu/packages/mpi.scm (hwloc-2.0): Rename to...
(hwloc-2): ... this. Update to 2.1.0
(hwloc-2.0): Define as deprecated.
* gnu/packages/opencl.scm (pocl)[inputs]: Adjust accordingly.
| -rw-r--r-- | gnu/packages/mpi.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/opencl.scm | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index a87194408f..6078186f40 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -31,6 +31,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix deprecation) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -130,11 +131,11 @@ a powerful programming interface to gather information about the hardware, bind processes, and much more.") (license bsd-3))) -(define-public hwloc-2.0 +(define-public hwloc-2 ;; Note: 2.0 isn't the default yet, see above. (package (inherit hwloc) - (version "2.0.3") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "https://www.open-mpi.org/software/hwloc/v" @@ -142,7 +143,7 @@ bind processes, and much more.") "/downloads/hwloc-" version ".tar.bz2")) (sha256 (base32 - "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3")))) + "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr")))) ;; libnuma is no longer needed. (inputs (alist-delete "numactl" (package-inputs hwloc))) @@ -159,6 +160,9 @@ bind processes, and much more.") "-1")) #t)))))))) +(define-deprecated hwloc-2.0 'hwloc-2 + hwloc-2) + (define-public openmpi (package (name "openmpi") diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 81e5bab9db..50c99118c1 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -312,7 +312,7 @@ back-end for the LLVM compiler framework.") ("pkg-config" ,pkg-config))) (inputs `(("clang" ,clang) - ("hwloc" ,hwloc-2.0 "lib") + ("hwloc" ,hwloc-2 "lib") ("llvm" ,llvm-8) ("ocl-icd" ,ocl-icd))) (arguments |