unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: 73818@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludovic.courtes@inria.fr>
Subject: [bug#73818] [PATCH 1/2] gnu: openmpi@5: Remove reference to GCC and other build tools.
Date: Tue, 15 Oct 2024 14:45:03 +0200	[thread overview]
Message-ID: <40bb05332e8a6af8e964b57e1648ab4c38b8874f.1728996088.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1728996088.git.ludo@gnu.org>

From: Ludovic Courtès <ludovic.courtes@inria.fr>

This removes GCC from the direct references of openmpi@5.

* gnu/packages/mpi.scm (openmpi-5)[arguments]: Replace arguments
entirely instead of using ‘substitute-keyword-arguments’.  Reintroduce
‘remove-absolute’ phase.  Remove ‘find-opensm-headers’ and ‘remove-logs’
phases, which are no longer needed.

Change-Id: Ia3b25230488ca13310cd5bb2ae45f6990e906fa5
---
 gnu/packages/mpi.scm | 59 +++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 75cfd4af66..6e1f972eb8 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -339,37 +339,46 @@ (define-public openmpi-5
 
     (outputs '("out" "debug"))
     (arguments
-     (substitute-keyword-arguments (package-arguments openmpi)
-       ((#:configure-flags _)
-        #~(list "--enable-mpi-ext=affinity" ;cr doesn't work
-                "--with-sge"
+     (list #:configure-flags
+           #~(list "--enable-mpi-ext=affinity"         ;cr doesn't work
+                   "--with-sge"
 
-                #$@(if (package? (this-package-input "valgrind"))
-                       #~("--enable-memchecker"
-                          "--with-valgrind")
-                       #~("--without-valgrind"))
+                   #$@(if (package? (this-package-input "valgrind"))
+                          #~("--enable-memchecker"
+                             "--with-valgrind")
+                          #~("--without-valgrind"))
 
-                "--with-hwloc=external"
-                "--with-libevent"
+                   "--with-hwloc=external"
+                   "--with-libevent"
 
-                ;; This replaces --enable-mpirun-prefix-by-default wich is deprecated
-                ;; since 5.x.
-                "--enable-prte-prefix-by-default"
+                   ;; 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"))
+                   ;; 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"))))
+                   ;; 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 phases)
-        #~(modify-phases #$phases
-            (delete 'remove-absolute)
-            (delete 'scrub-timestamps)))))))
+           #: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





  reply	other threads:[~2024-10-15 12:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-15 12:42 [bug#73818] [PATCH 0/2] Reduce size of openmpi@5 closure Ludovic Courtès
2024-10-15 12:45 ` Ludovic Courtès [this message]
2024-10-15 12:45 ` [bug#73818] [PATCH 2/2] gnu: prrte: Remove reference to GCC and other build tools Ludovic Courtès

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=40bb05332e8a6af8e964b57e1648ab4c38b8874f.1728996088.git.ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=73818@debbugs.gnu.org \
    --cc=ludovic.courtes@inria.fr \
    /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).