GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-29 21:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into 'main'

Browse source 
test modif

See merge request glicid-public/guix-glicid!305
This commit is contained in:
Yann Dupont 2023-07-11 10:21:48 +00:00
commit 664a08ee50
1 changed files with 45 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
glicid/packages/parallel.scm
View file

@ -188,15 +188,53 @@
#~(append #$original-flags #$flags)))))) #~(append #$original-flags #$flags))))))
(define slurm-base-package slurm-22.05-glicid) ;(display slurm-22.05-glicid)
;
(define-public slurm-22.05-glicid2 ;(define-public slurm-22.05-glicid2
(package ; (package
(inherit (package-with-configure-flags slurm-22.05-glicid ; (inherit (package-with-configure-flags slurm-22.05-glicid
; #~(list "--with-pmix=" (assoc-ref inputs "openpmix") ))) ; #~(list "--with-pmix=" (assoc-ref inputs "openpmix") )))
#~(list "--with-pmix"))) ;; #~(list "--with-pmix")))
;
; (name "slurm-22.05-glicid2")))
(name "slurm-22.05-glicid2")))
(define-public slurm-22.05-glicid-b
(package
(name "slurm")
(inherit slurm-22.05-glicid)
(arguments
(list #:configure-flags
#~(list "--enable-pam" "--sysconfdir=/etc/slurm"
"--disable-static"
(string-append "--with-freeipmi=" #$(this-package-input "freeipmi"))
(string-append "--with-hwloc="
(ungexp (this-package-input "hwloc") "lib"))
(string-append "--with-json=" #$(this-package-input "json-c"))
(string-append "--with-munge=" #$(this-package-input "munge"))
(string-appent "--with-pmix=" #$(this-package-input "openpmix"))
;; 32-bit support is marked as deprecated and needs to be
;; explicitly enabled.
#$@(if (target-64bit?) '() '("--enable-deprecated")))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-plugin-linker-flags
(lambda _
(substitute* (find-files "src/plugins/" "Makefile.in")
(("_la_LDFLAGS = ")
"_la_LDFLAGS = ../../../api/libslurm.la "))))
(add-after 'patch-plugin-linker-flags 'autoconf
(lambda _ (invoke "autoconf"))) ;configure.ac was patched
(add-after 'install 'install-libpmi
(lambda _
;; Open MPI expects libpmi to be provided by Slurm so install it.
(invoke "make" "install" "-C" "contribs/pmi")
;; Others expect pmi2.
(invoke "make" "install" "-C" "contribs/pmi2"))))))
)
)
(define-public slurm-23.02-upstream (define-public slurm-23.02-upstream