From 26eac378d2bd3b0a64c448bc46f22c8f9145290b Mon Sep 17 00:00:00 2001 From: Peter Andreas Entschev Date: Wed, 13 Mar 2024 03:40:24 -0700 Subject: [PATCH] Remove `libnuma` dependencies --- ci/build_wheel.sh | 4 ---- docker/Dockerfile | 1 - docker/UCXPy-MOFED.dockerfile | 1 - docker/UCXPy-rdma-core.dockerfile | 1 - docker/build-ucx.sh | 2 +- docs/source/install.rst | 1 - docs/source/ucx-debug.rst | 2 +- 7 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 25c6571b2..9cc871e9a 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -58,7 +58,6 @@ WHL=$(realpath final_dist/${underscore_package_name}*manylinux*.whl) LIBUCM=$(unzip -l $WHL | awk 'match($4, /libucm-[^\.]+\./) { print substr($4, RSTART) }') LIBUCT=$(unzip -l $WHL | awk 'match($4, /libuct-[^\.]+\./) { print substr($4, RSTART) }') LIBUCS=$(unzip -l $WHL | awk 'match($4, /libucs-[^\.]+\./) { print substr($4, RSTART) }') -LIBNUMA=$(unzip -l $WHL | awk 'match($4, /libnuma-[^\.]+\./) { print substr($4, RSTART) }') # Extract the libraries that have already been patched in by auditwheel mkdir -p repair_dist/${underscore_package_name}_${RAPIDS_PY_CUDA_SUFFIX}.libs/ucx @@ -95,9 +94,6 @@ do patchelf --replace-needed libuct.so.0 $LIBUCT $f patchelf --replace-needed libucs.so.0 $LIBUCS $f patchelf --replace-needed libucm.so.0 $LIBUCM $f - if [[ -n "$LIBNUMA" ]]; then - patchelf --replace-needed libnuma.so.1 $LIBNUMA $f - fi patchelf --add-rpath '$ORIGIN/..' $f fi done diff --git a/docker/Dockerfile b/docker/Dockerfile index a97ddafe1..ac5b30ee1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,7 +8,6 @@ RUN apt-get update && \ g++ \ git \ libcap2 \ - libnuma-dev \ libtool \ make \ udev \ diff --git a/docker/UCXPy-MOFED.dockerfile b/docker/UCXPy-MOFED.dockerfile index 1c180a7cb..c77b50313 100644 --- a/docker/UCXPy-MOFED.dockerfile +++ b/docker/UCXPy-MOFED.dockerfile @@ -31,7 +31,6 @@ RUN apt-get update -y \ dh-make \ git \ libcap2 \ - libnuma-dev \ libtool \ make \ pkg-config \ diff --git a/docker/UCXPy-rdma-core.dockerfile b/docker/UCXPy-rdma-core.dockerfile index 123eb086d..46020e9b1 100644 --- a/docker/UCXPy-rdma-core.dockerfile +++ b/docker/UCXPy-rdma-core.dockerfile @@ -27,7 +27,6 @@ RUN apt-get update -y \ dh-make \ git \ libcap2 \ - libnuma-dev \ libtool \ make \ pkg-config \ diff --git a/docker/build-ucx.sh b/docker/build-ucx.sh index f438b6ceb..45c00e5eb 100755 --- a/docker/build-ucx.sh +++ b/docker/build-ucx.sh @@ -19,7 +19,7 @@ git checkout ${UCX_VERSION_TAG} ./autogen.sh mkdir build-linux && cd build-linux ../contrib/configure-release --prefix=${CONDA_PREFIX} --with-sysroot --enable-cma \ - --enable-mt --enable-numa --with-gnu-ld --with-rdmacm --with-verbs \ + --enable-mt --with-gnu-ld --with-rdmacm --with-verbs \ --with-cuda=${CUDA_HOME} \ ${CONFIGURE_ARGS} make -j install diff --git a/docs/source/install.rst b/docs/source/install.rst index d42e11299..ac3038f53 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -6,7 +6,6 @@ Prerequisites UCX depends on the following system libraries being present: -* For system topology identification: ``libnuma`` (``numactl`` on Enterprise Linux) * For MOFED 4.x support: ``libibcm``, ``libibverbs`` and ``librdmacm``. Ideally installed from `Mellanox OFED Drivers `_ * For MOFED 5.0 or higher: `Mellanox OFED Drivers `_ diff --git a/docs/source/ucx-debug.rst b/docs/source/ucx-debug.rst index 860541e6a..fcd0fdb17 100644 --- a/docs/source/ucx-debug.rst +++ b/docs/source/ucx-debug.rst @@ -33,7 +33,7 @@ For example, we can check if UCX has been built correctly with ``RDMA`` and if i #define HAVE_DECL_RDMA_ESTABLISH 1 #define HAVE_DECL_RDMA_INIT_QP_ATTR 1 #define HAVE_RDMACM_QP_LESS 1 - #define UCX_CONFIGURE_FLAGS "--disable-logging --disable-debug --disable-assertions --disable-params-check --prefix=/gpfs/fs1/user/miniconda3/envs/ucx-dev --with-sysroot --enable-cma --enable-mt --enable-numa --with-gnu-ld --with-rdmacm --with-verbs --with-cuda=/gpfs/fs1/SHARE/Utils/CUDA/10.2.89.0_440.33.01" + #define UCX_CONFIGURE_FLAGS "--disable-logging --disable-debug --disable-assertions --disable-params-check --prefix=/gpfs/fs1/user/miniconda3/envs/ucx-dev --with-sysroot --enable-cma --enable-mt --with-gnu-ld --with-rdmacm --with-verbs --with-cuda=/gpfs/fs1/SHARE/Utils/CUDA/10.2.89.0_440.33.01" #define uct_MODULES ":cuda:ib:rdmacm:cma"