From 262819988ad36ed1a0201b953bffeec23dfe5670 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 6 Aug 2024 18:19:44 -0500 Subject: [PATCH] use SKBUILD_BUILD_VERBOSE instead of SKBUILD_CMAKE_VERBOSE --- 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 08ae9d90..d180b627 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.8.15", + "version": "24.8.16", "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}" \