From 111bdcff48902457a7218f7ef8a80ad3dfaac3d1 Mon Sep 17 00:00:00 2001
From: Philippe SWARTVAGHER <philippe.swartvagher@inria.fr>
Date: Tue, 5 Jul 2022 23:18:44 +0200
Subject: gnu: hwloc: Update to 2.8.0

* gnu/packages/mpi.scm (hwloc): Update to 2.8.0

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/mpi.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/mpi.scm')

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 954c12c6f2..01dc9e355b 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -143,7 +143,7 @@ (define-public hwloc-2
   ;; Note: 2.x isn't the default yet, see above.
   (package
     (inherit hwloc-1)
-    (version "2.7.1")
+    (version "2.8.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.open-mpi.org/release/hwloc/v"
@@ -151,7 +151,7 @@ (define-public hwloc-2
                                   "/hwloc-" version ".tar.bz2"))
               (sha256
                (base32
-                "13ajxwshxl1pa8b5gnkmm7hcg97m6xrlgz8vj1hmsb57qcv1skhd"))))
+                "1ha23yqfx9kfxm5fcj9m0fnyf0r2k6p4k88xxqishclcsky752il"))))
 
     ;; libnuma is no longer needed.
     (inputs (modify-inputs (package-inputs hwloc-1)
-- 
cgit v1.2.3


From c8045fa0526774a6b1da979baee2f98a7185dbad Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 12 Jul 2022 21:33:27 +0300
Subject: gnu: openmpi: Only build with valgrind on supported systems.

* gnu/packages/mpi.scm (openmpi)[inputs]: Wrap valgrind in if-supported
macro.
[arguments]: Adjust configure-flags based on if valgrind is present.
---
 gnu/packages/mpi.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/mpi.scm')

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 01dc9e355b..ebf9238906 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2017 Dave Love <fx@gnu.org>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Paul Garlick <pgarlick@tourbillion-technology.com>
 ;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
@@ -217,17 +217,21 @@ (define-public openmpi
                (if-supported psm)
                (if-supported psm2)
                (if-supported ucx)
+               (if-supported valgrind)
                (list rdma-core
-                     valgrind
                      slurm))))         ;for PMI support (launching via "srun")
     (native-inputs
      (list pkg-config perl))
     (outputs '("out" "debug"))
     (arguments
      `(#:configure-flags `("--enable-mpi-ext=affinity" ;cr doesn't work
-                           "--enable-memchecker"
                            "--with-sge"
-                           "--with-valgrind"
+
+                           ,@(if ,(package? (this-package-input "valgrind"))
+                               `("--enable-memchecker"
+                                 "--with-valgrind")
+                               `("--without-valgrind"))
+
                            "--with-hwloc=external"
                            "--with-libevent"
 
-- 
cgit v1.2.3