From 1c745b25fbc0584801d8c98498c9c1b2c626f683 Mon Sep 17 00:00:00 2001 From: Caubet Serrabou Marc Date: Mon, 22 Mar 2021 11:43:04 +0100 Subject: [PATCH] Added GDRCOPY --- Libraries/ucx/build | 12 ++++++++---- Libraries/ucx/files/variants.merlin6 | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Libraries/ucx/build b/Libraries/ucx/build index 15448ce..3d829db 100755 --- a/Libraries/ucx/build +++ b/Libraries/ucx/build @@ -26,16 +26,20 @@ pbuild::pre_configure() { pbuild::add_configure_args "--with-verbs" if [[ -n "${CUDA_VERSION}" ]]; then - pbuild::add_configure_args "--with-cuda=$CUDA_HOME" + pbuild::add_configure_args "--with-cuda=${CUDA_HOME}" fi if [[ -n "${KNEM_VERSION}" ]]; then pbuild::add_configure_args "--with-knem" fi - if pbuild::use_flag slurm || pbuild::use_flag dgx; then - pbuild::add_configure_args "--without-gdrcopy" # Will be --with-gdrcopy when available - pbuild::add_configure_args "--with-rdmacm" + + if [[ -n "${GDRCOPY_VERSION}" ]]; then + pbuild::add_configure_args "--with-gdrcopy" else pbuild::add_configure_args "--without-gdrcopy" fi + + if pbuild::use_flag slurm || pbuild::use_flag dgx; then + pbuild::add_configure_args "--with-rdmacm" + fi } diff --git a/Libraries/ucx/files/variants.merlin6 b/Libraries/ucx/files/variants.merlin6 index 8ef9726..109825c 100644 --- a/Libraries/ucx/files/variants.merlin6 +++ b/Libraries/ucx/files/variants.merlin6 @@ -1,2 +1,3 @@ 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