From c7ae323b0be222678e2a27f0951b764d30659fb7 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 23 Oct 2024 11:14:50 -0500 Subject: [PATCH] print sccache stats, reduce wheel build verbosity --- .pre-commit-config.yaml | 2 +- ci/build_cpp.sh | 4 ++++ ci/build_python.sh | 4 ++++ ci/build_wheel.sh | 27 ++++++++------------------- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b912cf46a..62765dd93 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,7 +33,7 @@ repos: hooks: - id: verify-alpha-spec - 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_cpp.sh b/ci/build_cpp.sh index 9b419b816..2a347b7e5 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -17,6 +17,10 @@ rapids-logger "Begin cpp build" conda config --set path_conflict prevent +sccache --zero-stats + RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcucim +sccache --show-adv-stats + rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 25925f906..4c942e096 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -20,6 +20,8 @@ conda config --set path_conflict prevent CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +sccache --zero-stats + # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \ @@ -27,4 +29,6 @@ RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \ --channel "${CPP_CHANNEL}" \ conda/recipes/cucim +sccache --show-adv-stats + rapids-upload-conda-to-s3 python diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 88043f2cf..0e7e516d1 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -5,7 +5,6 @@ set -euo pipefail package_name="cucim" package_dir="python/cucim" -package_src_dir="${package_dir}/src/${package_name}" CMAKE_BUILD_TYPE="release" @@ -18,26 +17,15 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" PACKAGE_CUDA_SUFFIX="-${RAPIDS_PY_CUDA_SUFFIX}" -rapids-logger "Generating build requirements" -matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true" - +# Install pip build dependencies (not yet using pyproject.toml) rapids-dependency-file-generator \ - --output requirements \ - --file-key "py_build_${package_name}" \ - --matrix "${matrix_selectors}" \ -| tee /tmp/requirements-build.txt + --file-key "py_build" \ + --output "requirements" \ + --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee build_requirements.txt -rapids-dependency-file-generator \ - --output requirements \ - --file-key "py_rapids_build_${package_name}" \ - --matrix "${matrix_selectors}" \ -| tee -a /tmp/requirements-build.txt +python -m pip install -r build_requirements.txt -rapids-logger "Installing build requirements" -python -m pip install \ - -v \ - --prefer-binary \ - -r /tmp/requirements-build.txt +sccache --zero-stats # First build the C++ lib using CMake via the run script ./run build_local all ${CMAKE_BUILD_TYPE} @@ -46,11 +34,12 @@ sccache --show-adv-stats cd "${package_dir}" +sccache --zero-stats + rapids-logger "Building '${package_name}' wheel" python -m pip wheel \ -w dist \ -v \ - --no-build-isolation \ --no-deps \ --disable-pip-version-check \ .