From 1e0609f02c5db2147bf413b51bc3b0d8ae49fd17 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 29 Oct 2024 09:45:54 -0500 Subject: [PATCH 1/6] print sccache stats in builds --- .pre-commit-config.yaml | 2 +- ci/build_python.sh | 4 ++++ ci/build_wheel.sh | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) 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..1ab4108c 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,7 +16,11 @@ rapids-generate-version > ./VERSION rapids-logger "Begin py build" conda config --set path_conflict prevent +sccache --show-zero-stats + RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \ conda/recipes/ucx-py +sccache --show-adv-stats + rapids-upload-conda-to-s3 python diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 7db292dd..5dfcb536 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -13,8 +13,12 @@ rapids-generate-version > ./VERSION RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" +sccache --zero-stats + python -m pip wheel . -w dist --no-deps --disable-pip-version-check --config-settings rapidsai.disable-cuda=false +sccache --show-adv-stats + mkdir -p final_dist python -m auditwheel repair \ -w final_dist \ From ad8f488e2b54e3aa9f1a7dab33bfa3d40978d011 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 29 Oct 2024 11:06:50 -0500 Subject: [PATCH 2/6] Update ci/build_python.sh --- ci/build_python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index 1ab4108c..7a5cecb2 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,7 +16,7 @@ rapids-generate-version > ./VERSION rapids-logger "Begin py build" conda config --set path_conflict prevent -sccache --show-zero-stats +sccache --zero-stats RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \ conda/recipes/ucx-py From c301510e59fcf05e74febcf6668870fb53c63c06 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 29 Oct 2024 12:51:05 -0500 Subject: [PATCH 3/6] remove unnecessary configuration --- ci/build_python.sh | 6 ------ ci/build_wheel.sh | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index 1ab4108c..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 @@ -16,11 +14,7 @@ rapids-generate-version > ./VERSION rapids-logger "Begin py build" conda config --set path_conflict prevent -sccache --show-zero-stats - RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \ conda/recipes/ucx-py -sccache --show-adv-stats - rapids-upload-conda-to-s3 python diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 5dfcb536..90ecc2ed 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -6,18 +6,13 @@ 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})" -sccache --zero-stats - -python -m pip wheel . -w dist --no-deps --disable-pip-version-check --config-settings rapidsai.disable-cuda=false - -sccache --show-adv-stats +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 \ From ccebf777717f14692354d5c1c15651a483b08ae0 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 29 Oct 2024 12:52:52 -0500 Subject: [PATCH 4/6] more changes --- ci/build_wheel.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 9a052033..018faf3c 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -3,7 +3,6 @@ set -euo pipefail -package_name="ucx-py" underscore_package_name=$(echo "${package_name}" | tr "-" "_") source rapids-date-string From e5820b2367ac19a02bfb5461ec3ba27c5259cc97 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 29 Oct 2024 13:17:03 -0500 Subject: [PATCH 5/6] more script changes --- ci/build_wheel.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 018faf3c..56713dc3 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -3,8 +3,6 @@ set -euo pipefail -underscore_package_name=$(echo "${package_name}" | tr "-" "_") - source rapids-date-string rapids-generate-version > ./VERSION @@ -29,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 final_dist From 3aad6c3b63223cfce7c2373d0431cbc4f75922b2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 29 Oct 2024 15:42:59 -0500 Subject: [PATCH 6/6] Update ci/build_wheel.sh --- ci/build_wheel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 56713dc3..f3f69ddd 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -27,4 +27,4 @@ python -m auditwheel repair \ --exclude "libuct.so.0" \ dist/* -RAPIDS_PY_WHEEL_NAME="ucx_py_${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