Commit 17ecf6c5 authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

Switch to hwloc 2.x.

* inria/storm.scm (starpu-1.1)[propagated-inputs]: Use HWLOC-1.
(starpu-1.3)[propagated-inputs]: Use HWLOC instead of HWLOC-1.
* inria/mpi.scm (openmpi-with-mpi1-compat)[inputs]: New field.
* inria/hiepacs.scm (pastix-5)[propagated-inputs]: Use HWLOC-1.
parent 6d242103
......@@ -849,12 +849,14 @@ CTAGS = $(CTAGSPROG)
(native-inputs `(("perl" ,perl)
,@(package-native-inputs pastix-6)))
(propagated-inputs `(("openmpi" ,openmpi-with-mpi1-compat)
("hwloc" ,hwloc-1 "lib")
("openssh" ,openssh)
("scotch32" ,scotch32)
("pt-scotch" ,pt-scotch)
,@(package-propagated-inputs pastix-6)
,@(alist-delete "scotch"
(package-propagated-inputs pastix-6))))))
,@(fold alist-delete
(package-propagated-inputs pastix-6)
'("hwloc" "scotch"))))))
(define-public pastix pastix-6)
......
......@@ -6,7 +6,8 @@
(define-module (inria mpi)
#:use-module (guix)
#:use-module (guix utils)
#:use-module (gnu packages mpi))
#:use-module (gnu packages mpi)
#:use-module (srfi srfi-1))
(define-public openmpi-with-mpi1-compat
;; In Open MPI 4 the deprecated MPI1 functions are disabled by default.
......@@ -17,4 +18,8 @@
(arguments
(substitute-keyword-arguments (package-arguments openmpi)
((#:configure-flags flags ''())
`(cons "--enable-mpi1-compatibility" ,flags))))))
`(cons "--enable-mpi1-compatibility" ,flags))))
;; Depend on hwloc 1.x because that's what users of this package expect.
(inputs `(("hwloc" ,hwloc-1 "lib")
,@(alist-delete "hwloc" (package-inputs openmpi))))))
......@@ -100,7 +100,7 @@
("automake" ,automake))) ;used upon test failure
(inputs `(("fftw" ,fftw)
("fftwf" ,fftwf)))
(propagated-inputs `(("hwloc" ,hwloc "lib")
(propagated-inputs `(("hwloc" ,hwloc-1 "lib")
("mpi" ,openmpi-with-mpi1-compat)))
(synopsis "Run-time system for heterogeneous computing")
(description
......@@ -160,8 +160,10 @@ kernels are executed as efficiently as possible.")
(("/bin/sh") (which "sh")))
#t)))))))
(propagated-inputs `(("mpi" ,openmpi)
,@(alist-delete "mpi"
(package-propagated-inputs starpu-1.2))))))
("hwloc" ,hwloc "lib") ;hwloc 2.x
,@(fold alist-delete
(package-propagated-inputs starpu-1.2)
'("mpi" "hwloc"))))))
(define-public starpu
starpu-1.3)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment