From 96a469f1cdac9c3a1022eca3e7a3cb408b7464eb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 Nov 2019 22:56:43 +0100 Subject: gnu: openmpi: Fix typo. * gnu/packages/mpi.scm (openmpi)[inputs]: For UCX, check the supported systems of UCX, not PSM2. --- gnu/packages/mpi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 5fde6efae4..30169f76d4 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -192,7 +192,7 @@ bind processes, and much more.") `(("psm2" ,psm2)) '()) ,@(if (and (not (%current-target-system)) - (member (%current-system) (package-supported-systems psm2))) + (member (%current-system) (package-supported-systems ucx))) `(("ucx" ,ucx)) '()) ("rdma-core" ,rdma-core) -- cgit v1.2.3 From 6f160c5c3809c9fd7af7da3f215ca0222e24ccce Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 Nov 2019 23:22:53 +0100 Subject: Revert "gnu: openmpi: Pass explicit "--with-*" configure flags." This reverts commit eaa52b5baa8fbb26a79890561d0c40344d1e1bf3, which would lead to build failures on systems other than x86_64-linux. --- gnu/packages/mpi.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 30169f76d4..41655a4a5c 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -210,12 +210,6 @@ bind processes, and much more.") "--with-hwloc=external" "--with-libevent" - ;; Make sure ./configure fails if one of these is - ;; missing. - "--with-ucx" - "--with-psm" - "--with-psm2" - ;; InfiniBand support "--enable-openib-control-hdr-padding" "--enable-openib-dynamic-sl" -- cgit v1.2.3 From b1077c2234c47902990a6d27f471fd6b23a2df06 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 16 Nov 2019 17:19:17 +0100 Subject: gnu: openmpi: Silence UCX warnings when running tests. * gnu/packages/mpi.scm (%openmpi-setup): Set "UCX_LOG_LEVEL". --- gnu/packages/mpi.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 41655a4a5c..f51e03a4d7 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -342,6 +342,15 @@ only provides @code{MPI_THREAD_FUNNELED}."))) ;; Allow oversubscription in case there are less physical cores available ;; in the build environment than the package wants while testing. (setenv "OMPI_MCA_rmaps_base_mapping_policy" "core:OVERSUBSCRIBE") + + ;; UCX sometimes outputs uninteresting warnings such as: + ;; + ;; mpool.c:38 UCX WARN object 0x7ffff44fffc0 was not returned to mpool ucp_am_bufs + ;; + ;; These in turn leads to failures of test suites that capture and + ;; compare stdout, such as that of 'hdf5-parallel-openmpi'. Thus, tell + ;; UCX to not emit those warnings. + (setenv "UCX_LOG_LEVEL" "error") #t)) (define-public intel-mpi-benchmarks -- cgit v1.2.3 From 8ec7ca22d363b80b173ce87c5f39d5ca9686d248 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 19 Nov 2019 10:28:22 +0100 Subject: gnu: hwloc: Default to 2.x. * gnu/packages/mpi.scm (hwloc): Rename to... (hwloc-1): ... this. (hwloc-2): Adjust 'inherit' clause accordingly. (hwloc): New variable. --- gnu/packages/mpi.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index f51e03a4d7..116fa1ebb0 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -52,7 +52,7 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) -(define-public hwloc +(define-public hwloc-1 ;; Note: For now we keep 1.x as the default because many packages have yet ;; to migrate to 2.0. (package @@ -134,7 +134,7 @@ bind processes, and much more.") (define-public hwloc-2 ;; Note: 2.0 isn't the default yet, see above. (package - (inherit hwloc) + (inherit hwloc-1) (version "2.1.0") (source (origin (method url-fetch) @@ -163,6 +163,10 @@ bind processes, and much more.") (define-deprecated hwloc-2.0 'hwloc-2 hwloc-2) +(define-public hwloc + ;; The latest stable series of hwloc. + hwloc-2) + (define-public openmpi (package (name "openmpi") -- cgit v1.2.3 From 0d8a8234b5adbed898b37ea7187ab6ab505f83ee Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 19 Nov 2019 11:31:41 +0100 Subject: gnu: hwloc: Adjust references to 'hwloc'. This is a followup to 8ec7ca22d363b80b173ce87c5f39d5ca9686d248, which led to a stack overflow (cyclic graph) when attempting to build HWLOC-2. * gnu/packages/mpi.scm (hwloc-2): Refer to HWLOC-1 instead of HWLOC. --- 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 116fa1ebb0..9f6597c6b3 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -146,9 +146,9 @@ bind processes, and much more.") "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr")))) ;; libnuma is no longer needed. - (inputs (alist-delete "numactl" (package-inputs hwloc))) + (inputs (alist-delete "numactl" (package-inputs hwloc-1))) (arguments - (substitute-keyword-arguments (package-arguments hwloc) + (substitute-keyword-arguments (package-arguments hwloc-1) ((#:phases phases) `(modify-phases ,phases (replace 'skip-linux-libnuma-test -- cgit v1.2.3