diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index 4521d11..080f2e4 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -188,15 +188,53 @@ #~(append #$original-flags #$flags)))))) -(define slurm-base-package slurm-22.05-glicid) - -(define-public slurm-22.05-glicid2 - (package - (inherit (package-with-configure-flags slurm-22.05-glicid +;(display slurm-22.05-glicid) +; +;(define-public slurm-22.05-glicid2 +; (package +; (inherit (package-with-configure-flags slurm-22.05-glicid ; #~(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