From 317b2207a6709cd3870e0cdd4649a1b9125f4c43 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 29 Oct 2024 18:16:51 -0500 Subject: [PATCH] remove unnecessary sccache configuration, other small CI changes (#1089) Contributes to https://github.com/rapidsai/build-planning/issues/111 Proposes some small packaging/CI changes, matching similar changes being made across RAPIDS. * updating to the latest `rapids-dependency-file-generator` (v1.16.0) * removing unnecessary calls to `rapids-configure-sccache` (this project does not use `sccache`) ## Notes for Reviewers I'd originally started this PR with the goal of printing `sccache` stats in builds here... but realized this project does not use `sccache`. I chose not to pursue adding `sccache` here. The fact that this project doesn't use CMake means it'd take some effort to figure out how to inject `sccache` into the compilation (`CC` / `CXX` environment variables? something else?). Conda and wheel builds are only spending around 20 seconds actually compiling Cython code, so it doesn't seem worth the effort. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Mike Sarahan (https://github.com/msarahan) URL: https://github.com/rapidsai/ucx-py/pull/1089 --- .pre-commit-config.yaml | 2 +- ci/build_python.sh | 2 -- ci/build_wheel.sh | 14 ++++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df6e0b46..dcd83501 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - --fix - --rapids-version=24.12 - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.13.11 + rev: v1.16.0 hooks: - id: rapids-dependency-file-generator args: ["--clean"] diff --git a/ci/build_python.sh b/ci/build_python.sh index 1e423cc1..2fdcd640 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -5,8 +5,6 @@ set -euo pipefail rapids-configure-conda-channels -source rapids-configure-sccache - source rapids-date-string rapids-print-env diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 7db292dd..f3f69ddd 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -3,17 +3,19 @@ set -euo pipefail -package_name="ucx-py" -underscore_package_name=$(echo "${package_name}" | tr "-" "_") - -source rapids-configure-sccache source rapids-date-string rapids-generate-version > ./VERSION RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -python -m pip wheel . -w dist --no-deps --disable-pip-version-check --config-settings rapidsai.disable-cuda=false +python -m pip wheel \ + -v \ + -w dist \ + --no-deps \ + --disable-pip-version-check \ + --config-settings rapidsai.disable-cuda=false \ + . mkdir -p final_dist python -m auditwheel repair \ @@ -25,4 +27,4 @@ python -m auditwheel repair \ --exclude "libuct.so.0" \ dist/* -RAPIDS_PY_WHEEL_NAME="${underscore_package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 final_dist +RAPIDS_PY_WHEEL_NAME="ucx_py_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python final_dist