From f27d9f6844978f06607b2a10e8990058d922cab2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 7 Aug 2024 16:26:16 -0500 Subject: [PATCH] use SKBUILD_BUILD_VERBOSE instead of SKBUILD_CMAKE_VERBOSE (#377) Proposes switching from `SKBUILD_CMAKE_VERBOSE` to `SKBUILD_BUILD_VERBOSE` in wheel-building scripts in `rapids-build-utils`. Setting `SKBUILD_CMAKE_VERBOSE` in the environment causes an unavoidable build-time exception when using `scikit-build-core>=0.10.0` and setting `minimum-version = "0.10.0"` in `scikit-build-core`. ```text ERROR: Cannot set cmake.verbose if minimum-version is set to 0.10 or higher ``` ([build link](https://github.com/rapidsai/rmm/actions/runs/10274129734/job/28430178007?pr=1637#step:7:1878)) See https://scikit-build-core.readthedocs.io/en/latest/configuration.html#verbosity > Changed in version 0.10: cmake.verbose was renamed to build.verbose. ## Notes for Reviewers For more context, see the conversation on that PR and https://github.com/rapidsai/build-planning/issues/58. --- features/src/rapids-build-utils/devcontainer-feature.json | 2 +- .../opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh | 2 +- .../opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index 0fdd6635..1624b405 100644 --- a/features/src/rapids-build-utils/devcontainer-feature.json +++ b/features/src/rapids-build-utils/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "NVIDIA RAPIDS devcontainer build utilities", "id": "rapids-build-utils", - "version": "24.10.2", + "version": "24.10.3", "description": "A feature to install the RAPIDS devcontainer build utilities", "containerEnv": { "BASH_ENV": "/etc/bash.bash_env" diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh index 56fbc1d5..86c89ae2 100755 --- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh +++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh @@ -96,9 +96,9 @@ build_${PY_LIB}_python_wheel() { PARALLEL_LEVEL="${n_jobs}" \ CMAKE_ARGS="${cmake_args[*]@Q}" \ SKBUILD_BUILD_OPTIONS="${ninja_args[*]}" \ + SKBUILD_BUILD_VERBOSE="${v:+True}" \ SKBUILD_LOGGING_LEVEL="${v:+INFO}" \ SKBUILD_INSTALL_STRIP="${strip:+True}" \ - SKBUILD_CMAKE_VERBOSE="${v:+True}" \ SKBUILD_CMAKE_BUILD_TYPE="${build_type}" \ CMAKE_BUILD_PARALLEL_LEVEL="${n_jobs}" \ NVCC_APPEND_FLAGS="${nvcc_append_flags}" \ diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh index 89e9d3a9..4e2c94b5 100755 --- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh +++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh @@ -114,9 +114,9 @@ install_${PY_LIB}_python() { PARALLEL_LEVEL="${n_jobs}" \ CMAKE_ARGS="${cmake_args[*]@Q}" \ SKBUILD_BUILD_OPTIONS="${ninja_args[*]}" \ + SKBUILD_BUILD_VERBOSE="${v:+True}" \ SKBUILD_LOGGING_LEVEL="${v:+INFO}" \ SKBUILD_INSTALL_STRIP="${strip:+True}" \ - SKBUILD_CMAKE_VERBOSE="${v:+True}" \ SKBUILD_CMAKE_BUILD_TYPE="${build_type}" \ CMAKE_BUILD_PARALLEL_LEVEL="${n_jobs}" \ NVCC_APPEND_FLAGS="${nvcc_append_flags}" \