From db7f7afccd9019e6d67935c5624e7120d9a28d06 Mon Sep 17 00:00:00 2001 From: Caubet Serrabou Marc Date: Mon, 1 Mar 2021 15:28:33 +0100 Subject: [PATCH] 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