Skip to content

Commit

Permalink
Merge branch 'branch-24.10' into pylibcudf
Browse files Browse the repository at this point in the history
  • Loading branch information
lithomas1 authored Aug 12, 2024
2 parents 2bfa1e5 + f27d9f6 commit ae4562d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}'))")
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion features/src/rapids-build-utils/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "NVIDIA RAPIDS devcontainer build utilities",
"id": "rapids-build-utils",
"version": "24.10.2",
"version": "24.10.4",
"description": "A feature to install the RAPIDS devcontainer build utilities",
"containerEnv": {
"BASH_ENV": "/etc/bash.bash_env"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ae4562d

Please sign in to comment.