From 1bcf1a014646a36963bf7032cefe05ceec1c1465 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Dec 2024 13:19:02 +0200 Subject: [PATCH] gnu: openmpi-5: Don't force building with ucx. * gnu/packages/mpi.scm (openmpi-5)[inputs]: Use inherited inputs to only add ucx when it is supported. [arguments]: Only add configure-flag for ucx when it is included as an input. Change-Id: I4a5fc86999ffbafdb99bd68c170fc7a1fa6a33a5 --- gnu/packages/mpi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 20497242e5..7ede242aaa 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -332,7 +332,6 @@ (define-public openmpi-5 ;; 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) @@ -365,7 +364,9 @@ (define-public openmpi-5 ;; 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"))) + #$@(if (package? (this-package-input "ucx")) + #~((string-append "--with-ucx=" #$(this-package-input "ucx"))) + #~())) #:phases #~(modify-phases %standard-phases