From ae7716dd3620ea9327aeff9d707df83676cdc6e9 Mon Sep 17 00:00:00 2001 From: caubet_m Date: Wed, 3 May 2023 10:45:35 +0200 Subject: [PATCH 1/3] Add GDRCopy, UCX --- Libraries/GDRCopy/files/variants.merlin6 | 1 + Libraries/ucx/files/variants.merlin6 | 1 + 2 files changed, 2 insertions(+) diff --git a/Libraries/GDRCopy/files/variants.merlin6 b/Libraries/GDRCopy/files/variants.merlin6 index 7d46b14..d915a48 100644 --- a/Libraries/GDRCopy/files/variants.merlin6 +++ b/Libraries/GDRCopy/files/variants.merlin6 @@ -1 +1,2 @@ GDRCopy/2.2.0 stable cuda/11.2.2 +GDRCopy/2.3.0 unstable b:cuda/12.1.1 diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6 index 2cc60e6..a89a340 100644 --- a/Libraries/ucx/files/variants.merlin6 +++ b/Libraries/ucx/files/variants.merlin6 @@ -15,6 +15,7 @@ ucx/1.13.1_slurm stable b:cuda/11.5.1 b:doxygen/1.9.2 b:knem/1.1.4 ucx/1.13.1-3_slurm unstable b:cuda/11.1.0 b:doxygen/1.9.2 b:knem/1.1.4 b:GDRCopy/2.2.0 ucx/1.14.0-5_slurm unstable b:cuda/11.5.1 b:doxygen/1.9.2 b:knem/1.1.4 b:GDRCopy/2.2.0 +ucx/1.14.0_slurm unstable b:cuda/12.1.1 b:doxygen/1.9.2 b:knem/1.1.4 b:GDRCopy/2.3.0 ucx/1.9.0_dgx deprecated cuda/11.1.0 b:doxygen/1.8.14 b:knem/1.1.4 ucx/1.10.0-1_dgx deprecated cuda/11.2.2 b:doxygen/1.8.14 b:knem/1.1.4 b:GDRCopy/2.2.0 From 2c80d321075bed375019c71e867f087e2eedf0fc Mon Sep 17 00:00:00 2001 From: caubet_m Date: Mon, 5 Jun 2023 15:51:05 +0200 Subject: [PATCH 2/3] Cuda 12.1.1 and UCX 1.14.1 with Cuda 12.1.1 --- Libraries/ucx/build | 1 + Libraries/ucx/files/variants.merlin6 | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Libraries/ucx/build b/Libraries/ucx/build index a89ce97..bafe3df 100755 --- a/Libraries/ucx/build +++ b/Libraries/ucx/build @@ -46,6 +46,7 @@ pbuild::pre_configure() { pbuild::add_configure_args "--enable-cma" pbuild::add_configure_args "--enable-mt" pbuild::add_configure_args "--with-verbs" + pbuild::add_configure_args "--without-go" if [[ -n "${CUDA_VERSION}" ]]; then pbuild::add_configure_args "--with-cuda=${CUDA_HOME}" diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6 index a89a340..467f758 100644 --- a/Libraries/ucx/files/variants.merlin6 +++ b/Libraries/ucx/files/variants.merlin6 @@ -15,7 +15,8 @@ ucx/1.13.1_slurm stable b:cuda/11.5.1 b:doxygen/1.9.2 b:knem/1.1.4 ucx/1.13.1-3_slurm unstable b:cuda/11.1.0 b:doxygen/1.9.2 b:knem/1.1.4 b:GDRCopy/2.2.0 ucx/1.14.0-5_slurm unstable b:cuda/11.5.1 b:doxygen/1.9.2 b:knem/1.1.4 b:GDRCopy/2.2.0 -ucx/1.14.0_slurm unstable b:cuda/12.1.1 b:doxygen/1.9.2 b:knem/1.1.4 b:GDRCopy/2.3.0 +ucx/1.14.0_slurm removed b:cuda/12.1.1 b:doxygen/1.9.2 b:knem/1.1.4 b:GDRCopy/2.3.0 +ucx/1.14.1_slurm unstable b:cuda/12.1.1 b:doxygen/1.9.2 b:knem/1.1.4 b:GDRCopy/2.3.0 ucx/1.9.0_dgx deprecated cuda/11.1.0 b:doxygen/1.8.14 b:knem/1.1.4 ucx/1.10.0-1_dgx deprecated cuda/11.2.2 b:doxygen/1.8.14 b:knem/1.1.4 b:GDRCopy/2.2.0 From a047c0f6d1b19fd1a49599aec2a866578002a01f Mon Sep 17 00:00:00 2001 From: caubet_m Date: Mon, 5 Jun 2023 16:44:14 +0200 Subject: [PATCH 3/3] OpenMPI 4.1.5 with CUDA 12.1.1 and UCX 1.14.1 support --- Compiler/openmpi/files/variants.merlin6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Compiler/openmpi/files/variants.merlin6 b/Compiler/openmpi/files/variants.merlin6 index 18bbcdc..7e9bcb4 100644 --- a/Compiler/openmpi/files/variants.merlin6 +++ b/Compiler/openmpi/files/variants.merlin6 @@ -37,8 +37,10 @@ openmpi/4.0.7-1_slurm stable gcc/10.2.0 cuda/11.4.3 b:ucx/1.11.2-1_slurm openmpi/4.1.1_slurm unstable gcc/10.2.0 cuda/11.3.0 b:ucx/1.11.2_slurm openmpi/4.1.1-1_slurm unstable gcc/10.2.0 cuda/11.3.0 b:ucx/1.10.0_slurm -openmpi/4.1.3_slurm stable gcc/{9.3.0,10.3.0,11.2.0} cuda/11.5.1 b:ucx/1.12.1_slurm -openmpi/4.1.4_slurm stable gcc/10.4.0 cuda/11.5.1 b:ucx/1.12.1_slurm +openmpi/4.1.3_slurm stable gcc/{9.3.0,10.3.0,11.2.0} cuda/11.5.1 b:ucx/1.12.1_slurm +openmpi/4.1.4_slurm stable gcc/10.4.0 cuda/11.5.1 b:ucx/1.12.1_slurm + +openmpi/4.1.5_slurm unstable gcc/10.4.0 cuda/12.1.1 b:ucx/1.14.1_slurm openmpi/4.0.5-1_dgx deprecated gcc/{8.4.0,9.3.0,10.2.0} cuda/11.2.2 b:ucx/1.10.0-1_dgx openmpi/4.1.0-1_dgx deprecated gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0-1_dgx