From c97bb4821c70f64cb5a4dde23d6a29c5ed1c40a8 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 1 Aug 2024 11:34:02 -0400 Subject: [PATCH 1/3] Move ucxx wheel one level deeper (#372) Required for https://github.com/rapidsai/ucxx/pull/252 Contributes to https://github.com/rapidsai/build-planning/issues/33 --------- Co-authored-by: Paul Taylor <178183+trxcllnt@users.noreply.github.com> --- features/src/rapids-build-utils/devcontainer-feature.json | 2 +- .../src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index 4f75a2ec..0fdd6635 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.1", + "version": "24.10.2", "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/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml index a107d2ac..614febd7 100755 --- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml +++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml @@ -39,7 +39,7 @@ repos: -DUCXX_ENABLE_RMM=ON python: - name: ucxx - sub_dir: python + sub_dir: python/ucxx depends: [ucxx] args: {cmake: -DFIND_UCXX_CPP=ON, install: *rapids_build_backend_args} - name: distributed-ucxx From e11397c5e9c70b6b0d8fa2df919709db650bbcac Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 7 Aug 2024 12:02:56 -0500 Subject: [PATCH 2/3] Improve update-version.sh (#378) This PR improves `update-version.sh` with ucxx/ucx-py version handling (this is being renamed elsewhere in RAPIDS so I am aligning it here). --- ci/release/update-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 40500fef..d30992d3 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -22,7 +22,7 @@ NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}') NEXT_PATCH=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[3]}') NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR} NEXT_FULL_TAG=${NEXT_MAJOR}.${NEXT_MINOR}.${NEXT_PATCH} -NEXT_UCX_PY_VERSION="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG})" +NEXT_UCXX_SHORT_TAG="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG})" # Need to distutils-normalize the versions for some use cases CURRENT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${CURRENT_SHORT_TAG}'))") @@ -46,7 +46,7 @@ for file in $(find .devcontainer -name devcontainer.json); do done sed_runner "s/branch-[[:digit:]]\{2\}\.[[:digit:]]\+/branch-${NEXT_SHORT_TAG}/g" ./features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml -sed_runner "s/branch-0.[[:digit:]]\+/branch-${NEXT_UCX_PY_VERSION}/g" ./features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml +sed_runner "s/branch-0.[[:digit:]]\+/branch-${NEXT_UCXX_SHORT_TAG}/g" ./features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml for file in $(find features -name devcontainer-feature.json); do tmp=$(mktemp) From f27d9f6844978f06607b2a10e8990058d922cab2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 7 Aug 2024 16:26:16 -0500 Subject: [PATCH 3/3] 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}" \