diff --git a/.rpmignore b/.rpmignore index 51595098284..7a54310d9b5 100644 --- a/.rpmignore +++ b/.rpmignore @@ -6,16 +6,11 @@ el9/daos-*tests*.rpm el9/daos-mofed*.rpm el9/daos-serialize*.rpm -el9/ucx*.rpm leap15/daos-*tests*.rpm leap15/daos-mofed*.rpm leap15/daos-serialize*.rpm -leap15/openucx*.rpm -leap15/ucx*.rpm leap15/*protobuf-c*.rpm ubuntu20.04/daos-*.deb ubuntu20.04/libdaos*.deb -ubuntu20.04/ucx*.deb - diff --git a/ci/provisioning/post_provision_config_common_functions.sh b/ci/provisioning/post_provision_config_common_functions.sh index 94810968f1b..bf1151dea60 100755 --- a/ci/provisioning/post_provision_config_common_functions.sh +++ b/ci/provisioning/post_provision_config_common_functions.sh @@ -428,7 +428,7 @@ post_provision_config_nodes() { mellanox_drivers=true break fi - done < <(lspci -mm | grep "ConnectX") + done < <(lspci -mm | grep "ConnectX" || true) if "$mellanox_drivers"; then # Remove OPA and install MOFED diff --git a/site_scons/components/__init__.py b/site_scons/components/__init__.py index 93df7ab2070..51df90bf374 100644 --- a/site_scons/components/__init__.py +++ b/site_scons/components/__init__.py @@ -159,31 +159,30 @@ def define_mercury(reqs): patch_rpath=['lib64'], build_env={'CFLAGS': "-fstack-usage -fPIC"}) - ucx_configure = ['./configure', '--disable-assertions', '--disable-params-check', '--enable-mt', - '--without-go', '--without-java', '--prefix=$UCX_PREFIX', - '--libdir=$UCX_PREFIX/lib64', '--enable-cma', '--without-cuda', - '--without-gdrcopy', '--with-verbs', '--without-knem', '--without-rocm', - '--without-xpmem', '--without-fuse3', '--without-ugni'] - - if reqs.target_type == 'debug': - ucx_configure.extend(['--enable-debug']) - else: - ucx_configure.extend(['--disable-debug', '--disable-logging']) - - reqs.define('ucx', - retriever=GitRepoRetriever(), - libs=['ucs', 'ucp', 'uct'], + # UCX is no longer built from source, the distribution provided packages are used instead. + ucx_packages = { + 'ucs': 'ucx-devel', + 'ucp': 'ucx-devel', + 'uct': 'ucx-devel', + } + if distro.linux_distribution()[0].split()[0] == 'openSUSE': + ucx_packages = { + 'ucs': 'libucs-devel', + 'ucp': 'libucp-devel', + 'uct': 'libuct-devel', + } + + reqs.define('ucx_ucs', + libs=['ucs'], functions={'ucs': ['ucs_debug_disable_signal']}, + package=ucx_packages['ucs']) + reqs.define('ucx_ucp', + libs=['ucp'], + package=ucx_packages['ucp']) + reqs.define('ucx_uct', + libs=['uct'], headers=['uct/api/uct.h'], - pkgconfig='ucx', - commands=[['./autogen.sh'], - ucx_configure, - ['make'], - ['make', 'install'], - ['mkdir', '-p', '$UCX_PREFIX/lib64/pkgconfig'], - ['cp', 'ucx.pc', '$UCX_PREFIX/lib64/pkgconfig']], - build_env={'CFLAGS': '-Wno-error'}, - package='ucx-devel' if inst(reqs, 'ucx') else None) + package=ucx_packages['uct']) mercury_build = ['cmake', '-DBUILD_SHARED_LIBS:BOOL=ON', @@ -230,7 +229,7 @@ def define_mercury(reqs): ['make', 'install']], libs=['mercury'], pkgconfig='mercury', - requires=['boost', 'ofi', 'ucx'] + libs, + requires=['boost', 'ofi', 'ucx_ucs', 'ucx_ucp', 'ucx_uct'] + libs, out_of_src_build=True, package='mercury-devel' if inst(reqs, 'mercury') else None, build_env={'CFLAGS': '-fstack-usage'}) diff --git a/utils/build.config b/utils/build.config index fd4ff8c9208..5d4ee9dc027 100644 --- a/utils/build.config +++ b/utils/build.config @@ -11,7 +11,6 @@ spdk=v26.01 ofi=v1.22.0 mercury=v2.4.1 protobufc=v1.3.3 -ucx=v1.20.0 [repos] argobots=https://github.com/pmodels/argobots.git @@ -23,7 +22,6 @@ spdk=https://github.com/spdk/spdk.git ofi=https://github.com/ofiwg/libfabric.git mercury=https://github.com/mercury-hpc/mercury.git protobufc=https://github.com/protobuf-c/protobuf-c.git -ucx=https://github.com/openucx/ucx.git [patch_versions] spdk=0001_external_isal_v26.01.patch diff --git a/utils/scripts/install-el9.sh b/utils/scripts/install-el9.sh index 559948de712..bff04dd423d 100755 --- a/utils/scripts/install-el9.sh +++ b/utils/scripts/install-el9.sh @@ -69,6 +69,7 @@ dnf --nodocs install ${dnf_install_args} \ python${PYTHON_VERSION}-pip \ rpm-build \ sudo \ + ucx-devel \ valgrind-devel \ which \ ncurses-devel \ diff --git a/utils/scripts/install-leap15.sh b/utils/scripts/install-leap15.sh index 68091f27f57..0a2cd2222f2 100755 --- a/utils/scripts/install-leap15.sh +++ b/utils/scripts/install-leap15.sh @@ -51,6 +51,9 @@ dnf --nodocs install ${dnf_install_args} \ libopenssl-devel \ libprotobuf-c-devel \ libtool \ + libucp-devel \ + libucs-devel \ + libuct-devel \ libunwind-devel \ libuuid-devel \ libyaml-devel \ diff --git a/utils/scripts/install-ubuntu.sh b/utils/scripts/install-ubuntu.sh index 3191faacc37..ceed40ccc86 100755 --- a/utils/scripts/install-ubuntu.sh +++ b/utils/scripts/install-ubuntu.sh @@ -53,6 +53,7 @@ apt-get install ${apt_get_install_args} \ librdmacm-dev \ libssl-dev \ libtool-bin \ + libucx-dev \ libunwind-dev \ libyaml-dev \ locales \ diff --git a/utils/test_memcheck.supp b/utils/test_memcheck.supp index c8147f0adcb..2f83a412f34 100644 --- a/utils/test_memcheck.supp +++ b/utils/test_memcheck.supp @@ -334,14 +334,6 @@ fun:ompi_mpi_init ... } -{ - uninitialized value in MPI_init - Memcheck:Value8 - ... - ... - fun:ompi_mpi_init - ... -} { Leak in start thread, mpi Memcheck:Leak