do not run auditwheel repair on distributed-ucxx

rapidsai · Oct 29, 2024 · 2219b8c · 2219b8c
1 parent f165b9f
commit 2219b8c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 34 deletions.
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -5,29 +5,6 @@ set -euo pipefail
 
 package_name=$1
 package_dir=$2
-package_type=$3
-underscore_package_name=$(echo "${package_name}" | tr "-" "_")
-
-# The list of shared libraries to exclude from wheels varies by project.
-#
-# Capturing that here in argument-parsing to allow this build_wheel.sh
-# script to be re-used by all wheel builds in the project.
-case "${package_dir}" in
-  python/libucxx)
-    EXCLUDE_ARGS=(
-      --exclude "libucp.so.0"
-    )
-  ;;
-  python/ucxx)
-    EXCLUDE_ARGS=(
-      --exclude "libucp.so.0"
-      --exclude "libucxx.so"
-    )
-  ;;
-  *)
-    EXCLUDE_ARGS=()
-  ;;
-esac
 
 source rapids-configure-sccache
 source rapids-date-string
@@ -49,11 +26,3 @@ python -m pip wheel \
     .
 
 sccache --show-adv-stats
-
-mkdir -p final_dist
-python -m auditwheel repair \
-    "${EXCLUDE_ARGS[@]}" \
-    -w final_dist \
-    dist/*
-
-RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 "${package_type}" final_dist
diff --git a/ci/build_wheel_distributed_ucxx.sh b/ci/build_wheel_distributed_ucxx.sh
@@ -5,4 +5,6 @@ set -euo pipefail
 
 package_dir="python/distributed-ucxx"
 
-./ci/build_wheel.sh distributed-ucxx "${package_dir}" python
+./ci/build_wheel.sh distributed-ucxx "${package_dir}"
+
+RAPIDS_PY_WHEEL_NAME="distributed_ucxx_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python "${package_dir}/dist"
diff --git a/ci/build_wheel_libucxx.sh b/ci/build_wheel_libucxx.sh
@@ -27,4 +27,12 @@ export PIP_NO_BUILD_ISOLATION=0
 
 export SKBUILD_CMAKE_ARGS="-DUCXX_ENABLE_RMM=ON"
 
-./ci/build_wheel.sh "${package_name}" "${package_dir}" cpp
+./ci/build_wheel.sh "${package_name}" "${package_dir}"
+
+mkdir -p "${package_dir}/final_dist"
+python -m auditwheel repair \
+    --exclude "libucp.so.0" \
+    -w "${package_dir}/final_dist" \
+    ${package_dir}/dist/*
+
+RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 cpp "${package_dir}/final_dist"
diff --git a/ci/build_wheel_ucxx.sh b/ci/build_wheel_ucxx.sh
@@ -18,4 +18,13 @@ export PIP_CONSTRAINT="/tmp/constraints.txt"
 
 export SKBUILD_CMAKE_ARGS="-DFIND_UCXX_CPP=ON;-DCMAKE_INSTALL_LIBDIR=ucxx/lib64;-DCMAKE_INSTALL_INCLUDEDIR=ucxx/include"
 
-./ci/build_wheel.sh ucxx "${package_dir}" python
+./ci/build_wheel.sh ucxx "${package_dir}"
+
+mkdir -p "${package_dir}/final_dist"
+python -m auditwheel repair \
+    --exclude "libucp.so.0" \
+    --exclude "libucxx.so" \
+    -w "${package_dir}/final_dist" \
+    ${package_dir}/dist/*
+
+RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python "${package_dir}/final_dist"