unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 74572@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>,
	Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#74572] [PATCH 5/6] gnu: openmpi-5: Reformat.
Date: Thu, 28 Nov 2024 16:47:56 +0900	[thread overview]
Message-ID: <83f356d678647fca5d92abc24c8c8ac8cd5282c9.1732774966.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <cover.1732774966.git.maxim.cournoyer@gmail.com>

Better comply to our 80 characters maximum width guideline.

* gnu/packages/mpi.scm (openmpi-5): Reformat.

Change-Id: Ib164c4d7dae7bece60738787fd950003fb75e057
---
 gnu/packages/mpi.scm | 103 ++++++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 41e57c3012..67e12657db 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -328,59 +328,62 @@ (define-public openmpi-5
        (sha256
         (base32 "0mw1z4ppnlvxngwd58kl5q26qmvf3bgjkd4r8wjpqis3pky86hdx"))))
 
-    (inputs (modify-inputs (package-inputs openmpi)
-              ;; As of Open MPI 5.0.X, PMIx is used to communicate
-              ;; with SLURM, so SLURM'S PMI is no longer needed.
-              (delete "slurm")
-              (append ucx)              ;for Infiniband support
-              (append openpmix)         ;for PMI support (launching via "srun")
-              (append prrte)))          ;for PMI support (launching via "srun")
-    (native-inputs (modify-inputs (package-native-inputs openmpi)
-                     (append python)))
+    (inputs
+     (modify-inputs (package-inputs openmpi)
+       ;; As of Open MPI 5.0.X, PMIx is used to communicate with SLURM, so
+       ;; SLURM'S PMI is no longer needed.
+       (delete "slurm")
+       (append ucx)                    ;for Infiniband support
+       (append openpmix)               ;for PMI support (launching via "srun")
+       (append prrte)))                ;for PMI support (launching via "srun")
+    (native-inputs
+     (modify-inputs (package-native-inputs openmpi)
+       (append python)))
 
     (outputs '("out" "debug"))
     (arguments
-     (list #:configure-flags
-           #~(list "--enable-mpi-ext=affinity"         ;cr doesn't work
-                   "--with-sge"
-                   "--disable-static"
-
-                   #$@(if (package? (this-package-input "valgrind"))
-                          #~("--enable-memchecker"
-                             "--with-valgrind")
-                          #~("--without-valgrind"))
-
-                   "--with-hwloc=external"
-                   "--with-libevent"
-
-                   ;; This replaces --enable-mpirun-prefix-by-default wich is deprecated
-                   ;; since 5.x.
-                   "--enable-prte-prefix-by-default"
-
-                   ;; Enable support for the 'Process Management Interface for Exascale'
-                   ;; (PMIx) used e.g. by Slurm for the management communication and
-                   ;; coordination of MPI processes.
-                   (string-append "--with-pmix=" #$(this-package-input "openpmix"))
-                   (string-append "--with-prrte=" #$(this-package-input "prrte"))
-
-                   ;; Since 5.x, Infiniband support is provided by ucx.
-                   ;; See https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes
-                   (string-append "--with-ucx=" #$(this-package-input "ucx")))
-
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'build 'remove-absolute
-                 (lambda _
-                   ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE
-                   ;; etc.) to reduce the closure size.  See
-                   ;; <https://lists.gnu.org/archive/html/guix-devel/2017-07/msg00388.html>
-                   ;; and
-                   ;; <https://www.mail-archive.com/users@lists.open-mpi.org//msg31397.html>.
-                   (substitute* '("oshmem/tools/oshmem_info/param.c"
-                                  "ompi/tools/ompi_info/param.c")
-                     (("_ABSOLUTE") "")))))
-
-           #:disallowed-references (list (canonical-package gcc))))))
+     (list
+      #:configure-flags
+      #~(list "--enable-mpi-ext=affinity" ;cr doesn't work
+              "--with-sge"
+              "--disable-static"
+
+              #$@(if (package? (this-package-input "valgrind"))
+                     #~("--enable-memchecker"
+                        "--with-valgrind")
+                     #~("--without-valgrind"))
+
+              "--with-hwloc=external"
+              "--with-libevent"
+
+              ;; This replaces --enable-mpirun-prefix-by-default wich is
+              ;; deprecated since 5.x.
+              "--enable-prte-prefix-by-default"
+
+              ;; Enable support for the 'Process Management Interface for
+              ;; Exascale' (PMIx) used e.g. by Slurm for the management
+              ;; communication and coordination of MPI processes.
+              (string-append "--with-pmix=" #$(this-package-input "openpmix"))
+              (string-append "--with-prrte=" #$(this-package-input "prrte"))
+
+              ;; Since 5.x, Infiniband support is provided by ucx.  See
+              ;; https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes
+              (string-append "--with-ucx=" #$(this-package-input "ucx")))
+
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'remove-absolute
+            (lambda _
+              ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE etc.)
+              ;; to reduce the closure size.  See
+              ;; <https://lists.gnu.org/archive/html/guix-devel/2017-07/msg00388.html>
+              ;; and
+              ;; <https://www.mail-archive.com/users@lists.open-mpi.org//msg31397.html>.
+              (substitute* '("oshmem/tools/oshmem_info/param.c"
+                             "ompi/tools/ompi_info/param.c")
+                (("_ABSOLUTE") "")))))
+
+      #:disallowed-references (list (canonical-package gcc))))))
 
 (define-public openmpi-c++
   (package/inherit openmpi
-- 
2.46.0





  parent reply	other threads:[~2024-11-28  7:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-28  6:24 [bug#74572] [PATCH 0/6] ] Python bindings, reduced size for OpenPMIx/OpenMPI Maxim Cournoyer
2024-11-28  7:47 ` [bug#74572] [PATCH 1/6] gnu: openmpi-5: Update to 5.0.6 Maxim Cournoyer
2024-11-28  7:47 ` [bug#74572] [PATCH 2/6] gnu: openpmix: Enable Python bindings Maxim Cournoyer
2024-11-28  7:47 ` [bug#74572] [PATCH 3/6] gnu: openpmix: Fix indentation Maxim Cournoyer
2024-11-28  7:47 ` [bug#74572] [PATCH 4/6] gnu: openpmix: Do not install HTML documentation Maxim Cournoyer
2024-11-28  7:47 ` Maxim Cournoyer [this message]
2024-11-28  7:47 ` [bug#74572] [PATCH 6/6] gnu: openmpi-5: Streamline source and do not install HTML doc Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83f356d678647fca5d92abc24c8c8ac8cd5282c9.1732774966.git.maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=74572@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).