From affc8d6ed2b193a8f10b2c2955f65b40cac343f5 Mon Sep 17 00:00:00 2001 From: Caubet Serrabou Marc Date: Mon, 1 Mar 2021 11:55:57 +0100 Subject: [PATCH 1/3] WIP: UCX 1.9.0 --- Libraries/ucx/build | 17 +++++++++++++++++ Libraries/ucx/files/variants.merlin6 | 1 + 2 files changed, 18 insertions(+) create mode 100644 Libraries/ucx/files/variants.merlin6 diff --git a/Libraries/ucx/build b/Libraries/ucx/build index 2170a53..5490f59 100755 --- a/Libraries/ucx/build +++ b/Libraries/ucx/build @@ -10,3 +10,20 @@ declare -rx CPP=/usr/bin/cpp #pbuild::add_configure_args "--disable-shared" pbuild::add_configure_args "--with-pic" +pbuild::add_configure_args "--enable-optimizations" # Recommended when compiled from source +pbuild::add_configure_args "--disable-logging" +pbuild::add_configure_args "--disable-debug" +pbuild::add_configure_args "--disable-assertions" +pbuild::add_configure_args "--enable-mt" +pbuild::add_configure_args "--disable-params-check" +pbuild::add_configure_args "--enable-cma" +pbuild::add_configure_args "--with-cuda" +pbuild::add_configure_args "--without-gdrcopy" +pbuild::add_configure_args "--with-verbs" +pbuild::add_configure_args "--without-cm" +pbuild::add_configure_args "--with-knem" +pbuild::add_configure_args "--with-rdmacm" +pbuild::add_configure_args "--without-rocm" +pbuild::add_configure_args "--without-xpmem" +pbuild::add_configure_args "--without-ugni" +pbuild::add_configure_args "--without-java" diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6 new file mode 100644 index 0000000..5c8ad0f --- /dev/null +++ b/Libraries/ucx/files/variants.merlin6 @@ -0,0 +1 @@ +ucx/1.9.0 unstable cuda/11.1.0 From b7f51bf1e911a3f91432bb5385d6adb48d35d35c Mon Sep 17 00:00:00 2001 From: Caubet Serrabou Marc Date: Mon, 1 Mar 2021 14:59:48 +0100 Subject: [PATCH 2/3] WIP: UCX 1.9.0 --- Libraries/ucx/build | 46 ++++++++++++++++------------ Libraries/ucx/files/variants.merlin6 | 2 +- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Libraries/ucx/build b/Libraries/ucx/build index 5490f59..a95879a 100755 --- a/Libraries/ucx/build +++ b/Libraries/ucx/build @@ -1,29 +1,35 @@ #!/usr/bin/env modbuild -pbuild::set_download_url "https://github.com/openucx/ucx/releases/download/v${V_PKG}/$P-$V.tar.gz" +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 -#pbuild::add_configure_args "--disable-shared" -pbuild::add_configure_args "--with-pic" +pbuild::pre_configure() { + #pbuild::add_configure_args "--disable-shared" + pbuild::add_configure_args "--with-pic" -pbuild::add_configure_args "--enable-optimizations" # Recommended when compiled from source -pbuild::add_configure_args "--disable-logging" -pbuild::add_configure_args "--disable-debug" -pbuild::add_configure_args "--disable-assertions" -pbuild::add_configure_args "--enable-mt" -pbuild::add_configure_args "--disable-params-check" -pbuild::add_configure_args "--enable-cma" -pbuild::add_configure_args "--with-cuda" -pbuild::add_configure_args "--without-gdrcopy" -pbuild::add_configure_args "--with-verbs" -pbuild::add_configure_args "--without-cm" -pbuild::add_configure_args "--with-knem" -pbuild::add_configure_args "--with-rdmacm" -pbuild::add_configure_args "--without-rocm" -pbuild::add_configure_args "--without-xpmem" -pbuild::add_configure_args "--without-ugni" -pbuild::add_configure_args "--without-java" + pbuild::add_configure_args "--enable-optimizations" # Recommended when compiled from source + pbuild::add_configure_args "--disable-logging" + pbuild::add_configure_args "--disable-debug" + pbuild::add_configure_args "--disable-assertions" + pbuild::add_configure_args "--disable-params-check" + pbuild::add_configure_args "--without-cm" + pbuild::add_configure_args "--without-rocm" + pbuild::add_configure_args "--without-xpmem" + pbuild::add_configure_args "--without-ugni" + pbuild::add_configure_args "--without-java" + pbuild::add_configure_args "--with-cuda=$CUDA_HOME" + pbuild::add_configure_args "--enable-cma" + pbuild::add_configure_args "--enable-mt" + pbuild::add_configure_args "--with-verbs" + if pbuild::use_flag slurm ; then + pbuild::add_configure_args "--without-gdrcopy" + pbuild::add_configure_args "--with-knem" + pbuild::add_configure_args "--with-rdmacm" + else + pbuild::add_configure_args "--without-gdrcopy" + fi +} diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6 index 5c8ad0f..2448818 100644 --- a/Libraries/ucx/files/variants.merlin6 +++ b/Libraries/ucx/files/variants.merlin6 @@ -1 +1 @@ -ucx/1.9.0 unstable cuda/11.1.0 +ucx/1.9.0_slurm unstable cuda/11.1.0 From db7f7afccd9019e6d67935c5624e7120d9a28d06 Mon Sep 17 00:00:00 2001 From: Caubet Serrabou Marc Date: Mon, 1 Mar 2021 15:28:33 +0100 Subject: [PATCH 3/3] WIP: UCX 1.9.0 --- Libraries/ucx/build | 7 +++++-- Libraries/ucx/files/variants.merlin6 | 2 +- Libraries/ucx/files/variants.rhel6 | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Libraries/ucx/build b/Libraries/ucx/build index a95879a..0d9fb7e 100755 --- a/Libraries/ucx/build +++ b/Libraries/ucx/build @@ -21,12 +21,15 @@ pbuild::pre_configure() { pbuild::add_configure_args "--without-xpmem" pbuild::add_configure_args "--without-ugni" pbuild::add_configure_args "--without-java" - pbuild::add_configure_args "--with-cuda=$CUDA_HOME" pbuild::add_configure_args "--enable-cma" pbuild::add_configure_args "--enable-mt" pbuild::add_configure_args "--with-verbs" + if [[ -n "${CUDA_VERSION}" ]]; then + pbuild::add_configure_args "--with-cuda=$CUDA_HOME" + fi + if pbuild::use_flag slurm ; then - pbuild::add_configure_args "--without-gdrcopy" + pbuild::add_configure_args "--without-gdrcopy" # Will be --with-gdrcopy when available pbuild::add_configure_args "--with-knem" pbuild::add_configure_args "--with-rdmacm" else diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6 index 2448818..0157456 100644 --- a/Libraries/ucx/files/variants.merlin6 +++ b/Libraries/ucx/files/variants.merlin6 @@ -1 +1 @@ -ucx/1.9.0_slurm unstable cuda/11.1.0 +ucx/1.9.0_slurm unstable cuda/11.1.0 b:doxygen/1.8.14 diff --git a/Libraries/ucx/files/variants.rhel6 b/Libraries/ucx/files/variants.rhel6 index f5d47d4..1dea9f9 100644 --- a/Libraries/ucx/files/variants.rhel6 +++ b/Libraries/ucx/files/variants.rhel6 @@ -1,2 +1,2 @@ ucx/1.8.1 unstable -ucx/1.9.0 unstable +ucx/1.9.0 unstable cuda/11.1.0 b:doxygen/1.8.14