Subject: bug#72062: closed (Re: [bug#72062] [PATCH v3 0/5] Add OpenMPI 5.x.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 19 Aug 2024 14:11:01 +0000

Your bug report

#72062: [PATCH 0/4] Add OpenMPI 5.x

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
72062: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72062
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#72062] [PATCH v3 0/5] Add OpenMPI 5.x.
From: Ludovic Courtès <[email-masked]>
To: Romain GARBAGE <[email-masked]>
Cc: [email-masked]
Date: Mon, 19 Aug 2024 16:09:42 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

Romain GARBAGE <[email-masked]> skribis:

>   gnu: Add openpmix.
>   gnu: Add prrte.
>   gnu: slurm: Add PMIx support.
>   gnu: Add openmpi-5.
>   gnu: openmpi: Set default version to 4.x.

I made the change below to ensure that all the versions of the ‘slurm’
package would still build.  It took me a while :-) but in the end it’s
just about removing ‘openmpix’ from the inputs of older versions.

Will push shortly.

Thank you!

Ludo’.

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index c62402cf5c..440a808f68 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -247,7 +247,10 @@ (define-public slurm
                    (string-append "--with-munge=" #$(this-package-input "munge"))
 
                    ;; Use PMIx bundled with Open MPI (this is required for Open MPI 5.x).
-                   (string-append "--with-pmix=" #$(this-package-input "openpmix"))
+                   #$(let ((openmpix (this-package-input "openpmix")))
+                       (if openmpix
+                           #~(string-append "--with-pmix=" #$openmpix)
+                           "--without-pmix"))
 
                    ;; 32-bit support is marked as deprecated and needs to be
                    ;; explicitly enabled.
@@ -310,10 +313,10 @@ (define-public slurm-22.05
 
 (define-public slurm-21.08
   (package
-    (inherit slurm)
+    (inherit slurm-22.05)
     (version "21.08.8")
     (source (origin
-              (inherit (package-source slurm))
+              (inherit (package-source slurm-22.05))
               (method url-fetch)
               (uri (string-append
                     "https://download.schedmd.com/slurm/slurm-"
@@ -321,14 +324,19 @@ (define-public slurm-21.08
               (patches '())                       ;drop 'salloc' patch
               (sha256
                (base32
-                "1sjln54idc9rhg8f2nvm38sgs6fncncyzslas8ixy65pqz2hphbf"))))))
+                "1sjln54idc9rhg8f2nvm38sgs6fncncyzslas8ixy65pqz2hphbf"))))
+
+    ;; This and older versions of slurm have PMIx support but they seem to
+    ;; require an older version of openpmix.  Disable PMIx support.
+    (inputs (pk 'x (modify-inputs (package-inputs slurm-22.05)
+                (delete "openpmix"))))))
 
 (define-public slurm-20.11
   (package
-    (inherit slurm)
+    (inherit slurm-21.08)
     (version "20.11.9")
     (source (origin
-              (inherit (package-source slurm))
+              (inherit (package-source slurm-21.08))
               (method url-fetch)
               (uri (string-append
                     "https://download.schedmd.com/slurm/slurm-"
@@ -340,10 +348,10 @@ (define-public slurm-20.11
 
 (define-public slurm-20.02
   (package
-    (inherit slurm)
+    (inherit slurm-20.11)
     (version "20.02.6-1")
     (source (origin
-              (inherit (package-source slurm))
+              (inherit (package-source slurm-20.11))
               (method url-fetch)
               (uri (string-append
                     "https://download.schedmd.com/slurm/slurm-"
@@ -353,7 +361,7 @@ (define-public slurm-20.02
                (base32
                 "0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments slurm)
+     (substitute-keyword-arguments (package-arguments slurm-20.11)
        ((#:configure-flags flags ''())
         #~(append '("CFLAGS=-O2 -g -fcommon" "LDFLAGS=-fcommon")
                   #$flags))))))
@@ -363,7 +371,7 @@ (define-public slurm-19.05
     (inherit slurm-20.02)
     (version "19.05.8")
     (source (origin
-              (inherit (package-source slurm))
+              (inherit (package-source slurm-20.02))
               (method url-fetch)
               (uri (string-append
                     "https://download.schedmd.com/slurm/slurm-"
@@ -376,11 +384,11 @@ (define-public slurm-19.05
 ;; Same as Debian 10
 (define-public slurm-18.08
   (package
-    (inherit slurm-20.02)
+    (inherit slurm-19.05)
     (version "18.08.9")
     (source
       (origin
-        (inherit (package-source slurm))
+        (inherit (package-source slurm-20.02))
         (uri (string-append
                "https://download.schedmd.com/slurm/slurm-"
                version ".tar.bz2"))

Subject: [PATCH 0/4] Add OpenMPI 5.x
From: Romain GARBAGE <[email-masked]>
To: [email-masked]
Cc: [email-masked], Romain GARBAGE <[email-masked]>
Date: Thu, 11 Jul 2024 16:25:08 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

This patch series aims at bringing the 5.x branch of OpenMPI to Guix.

First two patches are dependencies of OpenMPI 5.x.

Third patch adds a new package for OpenMPI 5.x, keeping OpenMPI 4.x as
the default version in package dependencies.

Fourth patch adds PMIx support, which is required for OpenMPI 5.x
support in SLURM.

These patches have been applied on top of commit
0663668507377a849317b0fff3d72f609c3139c2, all packages depending on
slurm and openmpi@5 have been successfully rebuilt.

Romain GARBAGE (4):
  gnu: Add openpmix.
  gnu: Add prrte.
  gnu: Add openmpi-5.
  gnu: slurm: Add PMIx support.

 gnu/packages/mpi.scm      | 52 ++++++++++++++++++++++++++++++
 gnu/packages/parallel.scm | 68 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)

-- 
2.45.1