From fe3d29066d36ead0778c49c2ca4983612159fc8e Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Tue, 18 Feb 2025 14:52:17 +0100 Subject: [PATCH] now uses pmix4 --- glicid/packages/mpi.scm | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index fba9d9b..fba6fb5 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -10,29 +10,34 @@ #:use-module (guix gexp) #:use-module (gnu packages)) -(define-public openmpi-glicid + +;(define-public openmpi-glicid-internal-pmix +; (package/inherit gnu:openmpi-4 +; (name "openmpi-glicid") +; (inputs (modify-inputs (package-inputs gnu:openmpi-4) +; (append openpmix) ;; because we use pmix4 now, openpmi-4 defaults to internal pmix3 +; (replace "slurm" slurm-glicid))) +; +; ) +;) + + + +(define-public openmpi-glicid-pmix (package/inherit gnu:openmpi-4 (name "openmpi-glicid") - (inputs (modify-inputs (package-inputs gnu:openmpi-4) - (append openpmix) ;; because we use pmix4 now, openpmi-4 defaults to internal pmix3 - (replace "slurm" slurm-glicid))) - - ) -) - - - -(define-public openmpi-glicid-new - (package/inherit gnu:openmpi-4 - (name "openmpi-glicid-new") (arguments (substitute-keyword-arguments (package-arguments gnu:openmpi-4) ((#:configure-flags flags) - (append `(cons* "--with-pmix=external" ,flags))))) + #~(append #$flags (list ;; original flags has --with-pmix=internal, we should remove it but last --with-pmix is the one taken into account. + (string-append "--with-pmix=" #$(this-package-input "openpmix")) + (string-append "--with-prrte=" #$(this-package-input "prrte")) + ) ;#$flags +)))) (inputs (modify-inputs (package-inputs gnu:openmpi-4) (append openpmix) ;; because we use pmix4 now, openpmi-4 defaults to internal pmix3 + (append prrte) ;; idem (replace "slurm" slurm-glicid))) ) ) -