Merge branch 'branch-0.37' into numpy-2-upper-bound

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,7 +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
-        patchelf --replace-needed libnuma.so.1 $LIBNUMA $f
         patchelf --add-rpath '$ORIGIN/..' $f
     fi
 done

conda/recipes/ucx-py/conda_build_config.yaml

@@ -4,4 +4,4 @@ cxx_compiler_version:
   - 11
 
 ucx:
-  - "==1.14.*"
+  - "==1.15.*"

conda/recipes/ucx-py/meta.yaml

@@ -35,7 +35,7 @@ requirements:
     {% endfor %}
   run:
     - python
-    - ucx >=1.14.1,<1.16.0
+    - ucx >=1.15.0,<1.16.0
     {% for r in data.get("project", {}).get("dependencies", []) %}
     - {{ r }}
     {% endfor %}

dependencies.yaml

@@ -118,7 +118,7 @@ dependencies:
           - pynvml>=11.4.1
       - output_types: conda
         packages:
-          - ucx
+          - ucx>=1.15.0,<1.16
   test_python:
     common:
       - output_types: [conda, requirements, pyproject]

docker/Dockerfile

@@ -8,7 +8,6 @@ RUN apt-get update && \
         g++ \
         git \
         libcap2 \
-        libnuma-dev \
         libtool \
         make \
         udev \

docker/UCXPy-MOFED.dockerfile

@@ -31,7 +31,6 @@ RUN apt-get update -y \
         dh-make \
         git \
         libcap2 \
-        libnuma-dev \
         libtool \
         make \
         pkg-config \

docker/UCXPy-rdma-core.dockerfile

@@ -27,7 +27,6 @@ RUN apt-get update -y \
         dh-make \
         git \
         libcap2 \
-        libnuma-dev \
         libtool \
         make \
         pkg-config \

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

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 <https://www.mellanox.com/products/infiniband-drivers/linux/mlnx_ofed>`_
 * For MOFED 5.0 or higher: `Mellanox OFED Drivers <https://www.mellanox.com/products/infiniband-drivers/linux/mlnx_ofed>`_
 

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"