Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove libnuma, update dependency to ucx>=1.15.0,<1.16 #1032

Merged
merged 3 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ci/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/ucx-py/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cxx_compiler_version:
- 11

ucx:
- "==1.14.*"
- "==1.15.*"
2 changes: 1 addition & 1 deletion conda/recipes/ucx-py/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 0 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ RUN apt-get update && \
g++ \
git \
libcap2 \
libnuma-dev \
libtool \
make \
udev \
Expand Down
1 change: 0 additions & 1 deletion docker/UCXPy-MOFED.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ RUN apt-get update -y \
dh-make \
git \
libcap2 \
libnuma-dev \
libtool \
make \
pkg-config \
Expand Down
1 change: 0 additions & 1 deletion docker/UCXPy-rdma-core.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ RUN apt-get update -y \
dh-make \
git \
libcap2 \
libnuma-dev \
libtool \
make \
pkg-config \
Expand Down
2 changes: 1 addition & 1 deletion docker/build-ucx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>`_

Expand Down
2 changes: 1 addition & 1 deletion docs/source/ucx-debug.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down
Loading