From 6aac661dcd101e3a2ef37b6bc7657d4db928e736 Mon Sep 17 00:00:00 2001 From: Caubet Serrabou Marc Date: Mon, 29 Mar 2021 11:50:46 +0200 Subject: [PATCH] UCX --- Compiler/openmpi/files/variants.merlin6 | 7 +++-- Libraries/ucx/build | 28 +++++++++++++++++--- Libraries/ucx/files/variants.merlin6 | 7 +++-- Libraries/ucx/files/version-to-gitcommit.txt | 1 + 4 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 Libraries/ucx/files/version-to-gitcommit.txt diff --git a/Compiler/openmpi/files/variants.merlin6 b/Compiler/openmpi/files/variants.merlin6 index c52c469..e848523 100644 --- a/Compiler/openmpi/files/variants.merlin6 +++ b/Compiler/openmpi/files/variants.merlin6 @@ -25,7 +25,10 @@ openmpi/4.0.5_slurm stable gcc/9.2.0 cuda/11.0.3 openmpi/4.0.5_slurm stable gcc/{8.4.0,9.3.0} cuda/11.1.0 openmpi/4.0.5_slurm stable intel/20.4 cuda/11.1.0 -openmpi/4.0.5_dgx unstable gcc/{8.4.0,9.3.0,10.2.0} cuda/11.2.2 b:ucx/1.10.0_dgx -openmpi/4.1.0_dgx unstable gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0_dgx +openmpi/4.0.5_dgx removed gcc/{8.4.0,9.3.0,10.2.0} cuda/11.2.2 b:ucx/1.10.0_dgx +openmpi/4.0.5_dgx_master removed gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0-1_dgx_master +openmpi/4.1.0_dgx removed gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0_slurm +openmpi/4.0.5-1_dgx unstable 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 unstable gcc/10.2.0 cuda/11.2.2 b:ucx/1.10.0-1_dgx openmpi/4.0.4_slurm_libpmix unstable gcc/9.3.0 diff --git a/Libraries/ucx/build b/Libraries/ucx/build index 3d829db..a89ce97 100755 --- a/Libraries/ucx/build +++ b/Libraries/ucx/build @@ -1,12 +1,34 @@ #!/usr/bin/env modbuild -pbuild::set_download_url "https://github.com/openucx/ucx/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz" -pbuild::add_to_group 'Libraries' - # use system gcc to compile declare -rx CC=gcc declare -rx CPP=/usr/bin/cpp +# Check 'version-to-gitcommit.txt' +# - If version exists, we will compile directly from GIT cloned commit. +# - If version does not exist, install from GIT repository package (tag). +COMMIT=$(grep -E "^${V}" files/version-to-gitcommit.txt | awk '{print $2}') + +if [[ ! -n ${COMMIT} ]]; then + pbuild::set_download_url "https://github.com/openucx/ucx/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz" +else + pbuild::pre_prep() { + # Only deploy package if it does not exist + if [[ ! -f $PMODULES_DISTFILESDIR/$P-$V.tar.gz ]]; then + git clone https://github.com/openucx/ucx.git ucx + cd ucx + git fetch -a + git checkout ${COMMIT} + ./autogen.sh + cd .. + tar --remove-files -cvzf $PMODULES_DISTFILESDIR/$P-$V.tar.gz ucx + fi + } + pbuild::set_download_url "https://github.com/openucx/ucx/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz" "$P-$V.tar.gz" +fi + +pbuild::add_to_group 'Libraries' + pbuild::pre_configure() { # pbuild::add_configure_args "--disable-shared" pbuild::add_configure_args "--with-pic" diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6 index 109825c..681092a 100644 --- a/Libraries/ucx/files/variants.merlin6 +++ b/Libraries/ucx/files/variants.merlin6 @@ -1,3 +1,6 @@ ucx/1.9.0_slurm unstable cuda/11.1.0 b:doxygen/1.8.14 b:knem/1.1.4 -ucx/1.9.0_dgx unstable cuda/11.0.3 b:doxygen/1.8.14 b:knem/1.1.4 -ucx/1.10.0_dgx unstable cuda/11.2.2 b:doxygen/1.8.14 b:knem/1.1.4 b:GDRCopy/2.2.0 +ucx/1.10.0_slurm removed cuda/11.2.2 b:doxygen/1.8.14 b:knem/1.1.4 b:GDRCopy/2.2.0 +ucx/1.10.0-1_dgx_master removed cuda/11.2.2 b:doxygen/1.8.14 b:knem/1.1.4 b:GDRCopy/2.2.0 +ucx/1.9.0_dgx removed cuda/11.0.3 b:doxygen/1.8.14 b:knem/1.1.4 +ucx/1.10.0_dgx removed cuda/11.2.2 b:doxygen/1.8.14 b:knem/1.1.4 b:GDRCopy/2.2.0 +ucx/1.10.0-1_dgx unstable cuda/11.2.2 b:doxygen/1.8.14 b:knem/1.1.4 b:GDRCopy/2.2.0 diff --git a/Libraries/ucx/files/version-to-gitcommit.txt b/Libraries/ucx/files/version-to-gitcommit.txt new file mode 100644 index 0000000..3fb1834 --- /dev/null +++ b/Libraries/ucx/files/version-to-gitcommit.txt @@ -0,0 +1 @@ +1.10.0-1_dgx c5c6269b574e33278908f51011abd38c379bdbb9