ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hwloc: Update to 2.1.0.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2019-11-12 18:17:29 +01:00 committed by Ludovic Courtès
parent 52cd164aad
commit 8c8e108978
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/mpi.scm
View file

@ -31,6 +31,7 @@ (define-module (gnu packages mpi)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix deprecation)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -130,11 +131,11 @@ (define-public hwloc
bind processes, and much more.") bind processes, and much more.")
(license bsd-3))) (license bsd-3)))
(define-public hwloc-2.0 (define-public hwloc-2
;; Note: 2.0 isn't the default yet, see above. ;; Note: 2.0 isn't the default yet, see above.
(package (package
(inherit hwloc) (inherit hwloc)
(version "2.0.3") (version "2.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/hwloc/v" (uri (string-append "https://www.open-mpi.org/software/hwloc/v"
@ -142,7 +143,7 @@ (define-public hwloc-2.0
"/downloads/hwloc-" version ".tar.bz2")) "/downloads/hwloc-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3")))) "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr"))))
;; libnuma is no longer needed. ;; libnuma is no longer needed.
(inputs (alist-delete "numactl" (package-inputs hwloc))) (inputs (alist-delete "numactl" (package-inputs hwloc)))
@ -159,6 +160,9 @@ (define-public hwloc-2.0
"-1")) "-1"))
#t)))))))) #t))))))))
(define-deprecated hwloc-2.0 'hwloc-2
hwloc-2)
(define-public openmpi (define-public openmpi
(package (package
(name "openmpi") (name "openmpi")

2
gnu/packages/opencl.scm
View file

@ -312,7 +312,7 @@ (define-public pocl
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("clang" ,clang) `(("clang" ,clang)
("hwloc" ,hwloc-2.0 "lib") ("hwloc" ,hwloc-2 "lib")
("llvm" ,llvm-8) ("llvm" ,llvm-8)
("ocl-icd" ,ocl-icd))) ("ocl-icd" ,ocl-icd)))
(arguments (arguments