From 80a8bd9b0546b6670b0598d1a3b99216f40d162e Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Mon, 11 Aug 2025 10:57:12 -0500 Subject: [PATCH 01/12] remove unused files --- ...ate-version-cuopt.sh => update-version.sh} | 102 +++++++++++++----- 1 file changed, 75 insertions(+), 27 deletions(-) rename ci/release/{update-version-cuopt.sh => update-version.sh} (57%) diff --git a/ci/release/update-version-cuopt.sh b/ci/release/update-version.sh similarity index 57% rename from ci/release/update-version-cuopt.sh rename to ci/release/update-version.sh index 3e2216fa4a..f1804c33f4 100755 --- a/ci/release/update-version-cuopt.sh +++ b/ci/release/update-version.sh @@ -24,9 +24,10 @@ CURRENT_TAG=$(git tag --merged HEAD | grep -xE '^v.*' | sort --version-sort | ta NEXT_MAJOR=$(echo "$NEXT_FULL_TAG" | awk '{split($0, a, "."); print a[1]}') NEXT_MINOR=$(echo "$NEXT_FULL_TAG" | awk '{split($0, a, "."); print a[2]}') NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR} -PY_NEXT_SHORT_TAG="${NEXT_MAJOR}.$(echo "$NEXT_MINOR" | sed 's/^0*//')" DOCKER_TAG=$(echo "$NEXT_FULL_TAG" | sed -E 's/^([0-9]{2})\.0*([0-9]+)\.0*([0-9]+).*/\1.\2.\3/') +# Need to distutils-normalize the versions for some use cases (RAPIDS) +NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))") echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG" @@ -37,19 +38,23 @@ function sed_runner() { # Centralized version file update echo "${NEXT_FULL_TAG}" > VERSION +echo "${NEXT_FULL_TAG}" > RAPIDS_VERSION dependencies='libcuopt libcuopt-cu12 cuopt cuopt-cu12 cuopt-mps-parser' for FILE in conda/environments/*.yaml dependencies.yaml; do for dependency in ${dependencies}; do - sed_runner "s/\(${dependency}==\)[0-9]\+\.[0-9]\+/\1${PY_NEXT_SHORT_TAG}/" "${FILE}" + sed_runner "s/\(${dependency}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" done done # CMakeLists update - sed_runner 's/'"VERSION [0-9][0-9].[0-9][0-9].[0-9][0-9]"'/'"VERSION ${NEXT_FULL_TAG}"'/g' cpp/CMakeLists.txt sed_runner 's/'"VERSION [0-9][0-9].[0-9][0-9].[0-9][0-9]"'/'"VERSION ${NEXT_FULL_TAG}"'/g' cpp/libmps_parser/CMakeLists.txt +# RAPIDS CMakeLists update +sed_runner 's/'"DEPENDENT_LIB_MAJOR_VERSION \"[0-9][0-9]\""'/'"DEPENDENT_LIB_MAJOR_VERSION \"${NEXT_MAJOR}\""'/g' cpp/CMakeLists.txt +sed_runner 's/'"DEPENDENT_LIB_MINOR_VERSION \"[0-9][0-9]\""'/'"DEPENDENT_LIB_MINOR_VERSION \"${NEXT_MINOR}\""'/g' cpp/CMakeLists.txt + # Server version update sed_runner 's/'"\"version\": \"[0-9][0-9].[0-9][0-9]\""'/'"\"version\": \"${NEXT_SHORT_TAG}\""'/g' python/cuopt_server/cuopt_server/utils/data_definition.py sed_runner 's/'"\"client_version\": \"[0-9][0-9].[0-9][0-9]\""'/'"\"client_version\": \"${NEXT_SHORT_TAG}\""'/g' python/cuopt_server/cuopt_server/utils/routing/data_definition.py @@ -64,33 +69,37 @@ sed_runner 's/cuopt=[0-9][0-9].[0-9][0-9].[^ ]* python=[0-9].[0-9][0-9] cuda-ver sed_runner 's/libcuopt=[0-9][0-9].[0-9][0-9].[^ ]* python=[0-9].[0-9][0-9] cuda-version=[0-9][0-9].[0-9]/libcuopt='${NEXT_SHORT_TAG}'.* python=3.12 cuda-version=12.8/g' docs/cuopt/source/cuopt-c/quick-start.rst sed_runner 's/cuopt-server=[0-9][0-9].[0-9][0-9].[^ ]* cuopt-sh-client=[0-9][0-9].[0-9][0-9].[^ ]* python=[0-9].[0-9][0-9]/cuopt-server='${NEXT_SHORT_TAG}'.* cuopt-sh-client='${NEXT_SHORT_TAG}'.* python=3.12/g' docs/cuopt/source/cuopt-server/quick-start.rst # Update quick-start docs for pip -sed_runner "s/\(cuopt-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${PY_NEXT_SHORT_TAG}.\*/g" docs/cuopt/source/cuopt-python/quick-start.rst -sed_runner "s/\(libcuopt-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${PY_NEXT_SHORT_TAG}.\*/g" docs/cuopt/source/cuopt-c/quick-start.rst -sed_runner "s/\(cuopt-server-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${PY_NEXT_SHORT_TAG}.\*/g" docs/cuopt/source/cuopt-server/quick-start.rst -sed_runner "s/\(cuopt-sh-client==\)[0-9]\+\.[0-9]\+\.\\*/\1${PY_NEXT_SHORT_TAG}.\*/g" docs/cuopt/source/cuopt-server/quick-start.rst +sed_runner "s/\(cuopt-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-python/quick-start.rst +sed_runner "s/\(libcuopt-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-c/quick-start.rst +sed_runner "s/\(cuopt-server-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-server/quick-start.rst +sed_runner "s/\(cuopt-sh-client==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-server/quick-start.rst # Update docker image tags in docs sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' docs/cuopt/source/cuopt-python/quick-start.rst sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' docs/cuopt/source/cuopt-server/quick-start.rst # Update doc version -# Update VERSIONS.json -VERSIONS_FILE="docs/cuopt/source/versions1.json" # Update project.json PROJECT_FILE="docs/cuopt/source/project.json" sed_runner 's/\("version": "\)[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]"/\1'${NEXT_FULL_TAG}'"/g' "${PROJECT_FILE}" -# Remove preferred and latest flags, but keep the version entry -sed_runner '/"name": "latest",/d' "${VERSIONS_FILE}" -sed_runner '/"preferred": true,\?/d' "${VERSIONS_FILE}" -# Remove all version entries except the version number and remove trailing commas -sed_runner 's/.*"url": ".*\/",\?$//g' "${VERSIONS_FILE}" -sed_runner 's/,\s*}/}/g' "${VERSIONS_FILE}" # Remove trailing commas before closing braces -sed_runner 's/,\s*$//g' "${VERSIONS_FILE}" # Remove trailing commas at end of lines -sed_runner '/^$/d' "${VERSIONS_FILE}" -# Add new version entry with both preferred and latest flags -NEW_VERSION_ENTRY=' {\n "version": "'${NEXT_SHORT_TAG}'",\n "url": "../'${NEXT_SHORT_TAG}'/",\n "name": "latest",\n "preferred": true\n },' -sed_runner "/\[/a\\${NEW_VERSION_ENTRY}" "${VERSIONS_FILE}" + +# Update VERSIONS.json +VERSIONS_FILE="docs/cuopt/source/versions1.json" +# Only update if NEXT_FULL_TAG is not already present +if ! grep -q "\"version\": \"${NEXT_FULL_TAG}\"" "${VERSIONS_FILE}"; then + # Remove preferred and latest flags, but keep the version entry + sed_runner '/"name": "latest",/d' "${VERSIONS_FILE}" + sed_runner '/"preferred": true,\?/d' "${VERSIONS_FILE}" + # Remove all version entries except the version number and remove trailing commas + sed_runner 's/.*"url": ".*\/",\?$//g' "${VERSIONS_FILE}" + sed_runner 's/,\s*}/}/g' "${VERSIONS_FILE}" # Remove trailing commas before closing braces + sed_runner 's/,\s*$//g' "${VERSIONS_FILE}" # Remove trailing commas at end of lines + sed_runner '/^$/d' "${VERSIONS_FILE}" + # Add new version entry with both preferred and latest flags + NEW_VERSION_ENTRY=' {\n "version": "'${NEXT_FULL_TAG}'",\n "url": "../'${NEXT_FULL_TAG}'/",\n "name": "latest",\n "preferred": true\n },' + sed_runner "/\[/a\\${NEW_VERSION_ENTRY}" "${VERSIONS_FILE}" +fi # RTD update sed_runner "/^set(cuopt_version/ s/[0-9][0-9].[0-9][0-9].[0-9][0-9]/${NEXT_FULL_TAG}/g" python/cuopt/CMakeLists.txt @@ -100,13 +109,9 @@ sed_runner "/^set(cuopt_version/ s/[0-9][0-9].[0-9][0-9].[0-9][0-9]/${NEXT_FULL_ # Update nightly sed_runner 's/'"cuopt_version: \"[0-9][0-9].[0-9][0-9]\""'/'"cuopt_version: \"${NEXT_SHORT_TAG}\""'/g' .github/workflows/nightly.yaml -# Update Service build -sed_runner 's/'"nvcr.io\/j9mrpofbmtxd\/test\/cuopt:[0-9][0-9].[0-9][0-9]\(\.arm\)\?"'/'"nvcr.io\/j9mrpofbmtxd\/test\/cuopt:${NEXT_SHORT_TAG}\1"'/g' .github/workflows/service_nightly.yaml -sed_runner 's/'"nvcr.io\/0616513341838337\/cuopt:[0-9][0-9].[0-9][0-9]\(\.arm\)\?"'/'"nvcr.io\/0616513341838337\/cuopt:${NEXT_SHORT_TAG}\1"'/g' .github/workflows/service_nightly.yaml - # Update README.md -sed_runner "s/\(cuopt-server-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${PY_NEXT_SHORT_TAG}.\*/g" README.md -sed_runner "s/\(cuopt-sh-client==\)[0-9]\+\.[0-9]\+\.\\*/\1${PY_NEXT_SHORT_TAG}.\*/g" README.md +sed_runner "s/\(cuopt-server-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" README.md +sed_runner "s/\(cuopt-sh-client==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" README.md sed_runner 's/cuopt-server=[0-9][0-9].[0-9][0-9] cuopt-sh-client=[0-9][0-9].[0-9][0-9] python=[0-9].[0-9][0-9] cuda-version=[0-9][0-9].[0-9]/cuopt-server='${NEXT_SHORT_TAG}' cuopt-sh-client='${NEXT_SHORT_TAG}' python=3.12 cuda-version=12.8/g' README.md sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' README.md @@ -123,6 +128,49 @@ DEPENDENCIES=( for DEP in "${DEPENDENCIES[@]}"; do for FILE in python/*/pyproject.toml; do - sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${PY_NEXT_SHORT_TAG}/" "${FILE}" + sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" + done +done + +# RAPIDS-specific updates +# RTD update for RAPIDS dependencies +rapids_dependencies='cudf cudf-cu12 cuvs cuvs-cu12 libcudf librmm librmm-cu12 rmm rmm-cu12 librmm libraft-headers pylibraft pylibraft-cu12 raft-dask raft-dask-cu12 rapids-dask-dependency' +for FILE in conda/environments/*.yaml dependencies.yaml; do + for dependency in ${rapids_dependencies}; do + sed_runner "s/\(${dependency}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" + done +done + +# WORKFLOWS for RAPIDS +for FILE in .github/workflows/*.yaml; do + sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" + # CI image tags of the form {rapids_version}-{something} + sed_runner "s/:[0-9]*\\.[0-9]*-/:${NEXT_SHORT_TAG}-/g" "${FILE}" +done + +# CI for RAPIDS +sed_runner 's/'"DEPENDENT_PACKAGE_VERSION=\"[0-9][0-9].[0-9][0-9]\""'/'"DEPENDENT_PACKAGE_VERSION=\"${NEXT_SHORT_TAG}\""'/g' ci/build_cpp.sh +sed_runner 's/'"DEPENDENT_PACKAGE_VERSION=\"[0-9][0-9].[0-9][0-9]\""'/'"DEPENDENT_PACKAGE_VERSION=\"${NEXT_SHORT_TAG}\""'/g' ci/build_python.sh + +# PYTHON for RAPIDS +sed_runner "/DOWNLOAD.*rapids-cmake/ s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/g" python/cuopt/CMakeLists.txt + +# Fixing RAPIDS dependencies and pyproject.toml +RAPIDS_DEPENDENCIES=( + cudf + cuvs + librmm + rmm + pylibraft + raft-dask + rapids-dask-dependency +) + +for DEP in "${RAPIDS_DEPENDENCIES[@]}"; do + for FILE in dependencies.yaml conda/environments/*.yaml; do + sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" + done + for FILE in python/*/pyproject.toml; do + sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" done done From 66735dcbcbd33c83b9e4bf8d484dce82256b2b68 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Mon, 11 Aug 2025 11:05:11 -0500 Subject: [PATCH 02/12] fix doc version --- ci/release/update-version.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index f1804c33f4..0144dc1412 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -88,11 +88,10 @@ sed_runner 's/\("version": "\)[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]"/\1'${NEXT_FULL VERSIONS_FILE="docs/cuopt/source/versions1.json" # Only update if NEXT_FULL_TAG is not already present if ! grep -q "\"version\": \"${NEXT_FULL_TAG}\"" "${VERSIONS_FILE}"; then - # Remove preferred and latest flags, but keep the version entry + # Remove preferred and latest flags, but keep the version entry and URL sed_runner '/"name": "latest",/d' "${VERSIONS_FILE}" sed_runner '/"preferred": true,\?/d' "${VERSIONS_FILE}" - # Remove all version entries except the version number and remove trailing commas - sed_runner 's/.*"url": ".*\/",\?$//g' "${VERSIONS_FILE}" + # Clean up trailing commas and empty lines sed_runner 's/,\s*}/}/g' "${VERSIONS_FILE}" # Remove trailing commas before closing braces sed_runner 's/,\s*$//g' "${VERSIONS_FILE}" # Remove trailing commas at end of lines sed_runner '/^$/d' "${VERSIONS_FILE}" From df05b6027126b74f2bbd7e5590de9cfac1e2a75f Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Mon, 11 Aug 2025 11:15:58 -0500 Subject: [PATCH 03/12] fix version --- ci/release/update-version.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 0144dc1412..1c71c7221a 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -91,10 +91,6 @@ if ! grep -q "\"version\": \"${NEXT_FULL_TAG}\"" "${VERSIONS_FILE}"; then # Remove preferred and latest flags, but keep the version entry and URL sed_runner '/"name": "latest",/d' "${VERSIONS_FILE}" sed_runner '/"preferred": true,\?/d' "${VERSIONS_FILE}" - # Clean up trailing commas and empty lines - sed_runner 's/,\s*}/}/g' "${VERSIONS_FILE}" # Remove trailing commas before closing braces - sed_runner 's/,\s*$//g' "${VERSIONS_FILE}" # Remove trailing commas at end of lines - sed_runner '/^$/d' "${VERSIONS_FILE}" # Add new version entry with both preferred and latest flags NEW_VERSION_ENTRY=' {\n "version": "'${NEXT_FULL_TAG}'",\n "url": "../'${NEXT_FULL_TAG}'/",\n "name": "latest",\n "preferred": true\n },' sed_runner "/\[/a\\${NEW_VERSION_ENTRY}" "${VERSIONS_FILE}" From 6cdf51dd31a1b41f0b3ae398dab2fc8490ed30d9 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Mon, 11 Aug 2025 11:21:13 -0500 Subject: [PATCH 04/12] fix version --- ci/release/update-version.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 1c71c7221a..ebf2bbb739 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -91,6 +91,8 @@ if ! grep -q "\"version\": \"${NEXT_FULL_TAG}\"" "${VERSIONS_FILE}"; then # Remove preferred and latest flags, but keep the version entry and URL sed_runner '/"name": "latest",/d' "${VERSIONS_FILE}" sed_runner '/"preferred": true,\?/d' "${VERSIONS_FILE}" + # Remove trailing comma after "url": ... in all version entries + sed_runner 's/\("url": "[^"]*"\),/\1/' "${VERSIONS_FILE}" # Add new version entry with both preferred and latest flags NEW_VERSION_ENTRY=' {\n "version": "'${NEXT_FULL_TAG}'",\n "url": "../'${NEXT_FULL_TAG}'/",\n "name": "latest",\n "preferred": true\n },' sed_runner "/\[/a\\${NEW_VERSION_ENTRY}" "${VERSIONS_FILE}" From 15a233358d85a8af5713e4d9359c86482d2ed69a Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Mon, 11 Aug 2025 11:50:18 -0500 Subject: [PATCH 05/12] fix version --- ci/release/update-version.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index ebf2bbb739..69e40f611f 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -40,7 +40,7 @@ function sed_runner() { echo "${NEXT_FULL_TAG}" > VERSION echo "${NEXT_FULL_TAG}" > RAPIDS_VERSION -dependencies='libcuopt libcuopt-cu12 cuopt cuopt-cu12 cuopt-mps-parser' +dependencies='libcuopt libcuopt-cu12 cuopt cuopt-cu12 cuopt-mps-parser cuopt-server cuopt-server-cu12 cuopt-sh-client' for FILE in conda/environments/*.yaml dependencies.yaml; do for dependency in ${dependencies}; do sed_runner "s/\(${dependency}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" @@ -65,9 +65,9 @@ sed_runner 's/'"\"client_version\": \"[0-9][0-9].[0-9][0-9]\""'/'"\"client_versi sed_runner 's/'"version = \"[0-9][0-9].[0-9][0-9]\""'/'"version = \"${NEXT_SHORT_TAG}\""'/g' docs/cuopt/source/conf.py sed_runner 's/'"PROJECT_NUMBER = [0-9][0-9].[0-9][0-9]"'/'"PROJECT_NUMBER = ${NEXT_SHORT_TAG}"'/g' cpp/doxygen/Doxyfile # Update quick-start docs for conda -sed_runner 's/cuopt=[0-9][0-9].[0-9][0-9].[^ ]* python=[0-9].[0-9][0-9] cuda-version=[0-9][0-9].[0-9]/cuopt='${NEXT_SHORT_TAG}'.* python=3.12 cuda-version=12.8/g' docs/cuopt/source/cuopt-python/quick-start.rst -sed_runner 's/libcuopt=[0-9][0-9].[0-9][0-9].[^ ]* python=[0-9].[0-9][0-9] cuda-version=[0-9][0-9].[0-9]/libcuopt='${NEXT_SHORT_TAG}'.* python=3.12 cuda-version=12.8/g' docs/cuopt/source/cuopt-c/quick-start.rst -sed_runner 's/cuopt-server=[0-9][0-9].[0-9][0-9].[^ ]* cuopt-sh-client=[0-9][0-9].[0-9][0-9].[^ ]* python=[0-9].[0-9][0-9]/cuopt-server='${NEXT_SHORT_TAG}'.* cuopt-sh-client='${NEXT_SHORT_TAG}'.* python=3.12/g' docs/cuopt/source/cuopt-server/quick-start.rst +sed_runner 's/cuopt=[0-9][0-9].[0-9][0-9].[^ ]*/cuopt='${NEXT_SHORT_TAG}'.*/g' docs/cuopt/source/cuopt-python/quick-start.rst +sed_runner 's/libcuopt=[0-9][0-9].[0-9][0-9].[^ ]*/libcuopt='${NEXT_SHORT_TAG}'.*/g' docs/cuopt/source/cuopt-c/quick-start.rst +sed_runner 's/cuopt-server=[0-9][0-9].[0-9][0-9].[^ ]* cuopt-sh-client=[0-9][0-9].[0-9][0-9].[^ ]*/cuopt-server='${NEXT_SHORT_TAG}'.* cuopt-sh-client='${NEXT_SHORT_TAG}'.*/g' docs/cuopt/source/cuopt-server/quick-start.rst # Update quick-start docs for pip sed_runner "s/\(cuopt-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-python/quick-start.rst sed_runner "s/\(libcuopt-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-c/quick-start.rst @@ -78,8 +78,6 @@ sed_runner "s/\(cuopt-sh-client==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP4 sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' docs/cuopt/source/cuopt-python/quick-start.rst sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' docs/cuopt/source/cuopt-server/quick-start.rst -# Update doc version - # Update project.json PROJECT_FILE="docs/cuopt/source/project.json" sed_runner 's/\("version": "\)[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]"/\1'${NEXT_FULL_TAG}'"/g' "${PROJECT_FILE}" @@ -109,7 +107,7 @@ sed_runner 's/'"cuopt_version: \"[0-9][0-9].[0-9][0-9]\""'/'"cuopt_version: \"${ # Update README.md sed_runner "s/\(cuopt-server-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" README.md sed_runner "s/\(cuopt-sh-client==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" README.md -sed_runner 's/cuopt-server=[0-9][0-9].[0-9][0-9] cuopt-sh-client=[0-9][0-9].[0-9][0-9] python=[0-9].[0-9][0-9] cuda-version=[0-9][0-9].[0-9]/cuopt-server='${NEXT_SHORT_TAG}' cuopt-sh-client='${NEXT_SHORT_TAG}' python=3.12 cuda-version=12.8/g' README.md +sed_runner 's/cuopt-server=[0-9][0-9].[0-9][0-9].* cuopt-sh-client=[0-9][0-9].[0-9][0-9].*/cuopt-server='${NEXT_SHORT_TAG}' cuopt-sh-client='${NEXT_SHORT_TAG}'/g' README.md sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' README.md # Update Helm chart files From 85fce84fd22d47b21d66ee5b3544ef49071a54e7 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Mon, 11 Aug 2025 11:56:25 -0500 Subject: [PATCH 06/12] remove rapids script --- ci/release/update-version-rapids.sh | 87 ----------------------------- 1 file changed, 87 deletions(-) delete mode 100755 ci/release/update-version-rapids.sh diff --git a/ci/release/update-version-rapids.sh b/ci/release/update-version-rapids.sh deleted file mode 100755 index 72f3e7cbe4..0000000000 --- a/ci/release/update-version-rapids.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -NEXT_FULL_TAG=$1 - -#Get . for next version -NEXT_MAJOR=$(echo "$NEXT_FULL_TAG" | awk '{split($0, a, "."); print a[1]}') -NEXT_MINOR=$(echo "$NEXT_FULL_TAG" | awk '{split($0, a, "."); print a[2]}') -NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR} - - -# Need to distutils-normalize the versions for some use cases -NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))") - -echo "Next is ${NEXT_SHORT_TAG_PEP440}" - -echo "Preparing release $NEXT_FULL_TAG" - -# Inplace sed replace; workaround for Linux and Mac -function sed_runner() { - sed -i.bak ''"$1"'' "$2" && rm -f "${2}".bak -} - -# Centralized version file update -echo "${NEXT_FULL_TAG}" > RAPIDS_VERSION - -# CMakeLists update -sed_runner 's/'"DEPENDENT_LIB_MAJOR_VERSION \"[0-9][0-9]\""'/'"DEPENDENT_LIB_MAJOR_VERSION \"${NEXT_MAJOR}\""'/g' cpp/CMakeLists.txt -sed_runner 's/'"DEPENDENT_LIB_MINOR_VERSION \"[0-9][0-9]\""'/'"DEPENDENT_LIB_MINOR_VERSION \"${NEXT_MINOR}\""'/g' cpp/CMakeLists.txt - -# RTD update -dependencies='cudf cudf-cu12 cuvs cuvs-cu12 libcudf librmm librmm-cu12 rmm rmm-cu12 librmm libraft-headers pylibraft pylibraft-cu12 raft-dask raft-dask-cu12 rapids-dask-dependency' -for FILE in conda/environments/*.yaml dependencies.yaml; do - for dependency in ${dependencies}; do - sed_runner "s/\(${dependency}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" - done -done - -# WORKFLOWS -for FILE in .github/workflows/*.yaml; do - sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" - # CI image tags of the form {rapids_version}-{something} - sed_runner "s/:[0-9]*\\.[0-9]*-/:${NEXT_SHORT_TAG}-/g" "${FILE}" -done - -# CI -sed_runner 's/'"DEPENDENT_PACKAGE_VERSION=\"[0-9][0-9].[0-9][0-9]\""'/'"DEPENDENT_PACKAGE_VERSION=\"${NEXT_SHORT_TAG}\""'/g' ci/build_cpp.sh -sed_runner 's/'"DEPENDENT_PACKAGE_VERSION=\"[0-9][0-9].[0-9][0-9]\""'/'"DEPENDENT_PACKAGE_VERSION=\"${NEXT_SHORT_TAG}\""'/g' ci/build_python.sh - - -# PYTHON -sed_runner "/DOWNLOAD.*rapids-cmake/ s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/g" python/cuopt/CMakeLists.txt - -# Fixing dependencies and pyproject.toml - -DEPENDENCIES=( - cudf - cuvs - librmm - rmm - pylibraft - raft-dask - rapids-dask-dependency -) - -for DEP in "${DEPENDENCIES[@]}"; do - for FILE in dependencies.yaml conda/environments/*.yaml; do - sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" - done - for FILE in python/*/pyproject.toml; do - sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" - done -done From 706222068b084c40a136aa8b68ba2b9e4955f2ab Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Thu, 14 Aug 2025 10:35:17 -0500 Subject: [PATCH 07/12] update as per review --- ci/release/update-version.sh | 112 +++++++++++++---------------------- 1 file changed, 42 insertions(+), 70 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 69e40f611f..5fa44cb532 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -40,18 +40,52 @@ function sed_runner() { echo "${NEXT_FULL_TAG}" > VERSION echo "${NEXT_FULL_TAG}" > RAPIDS_VERSION -dependencies='libcuopt libcuopt-cu12 cuopt cuopt-cu12 cuopt-mps-parser cuopt-server cuopt-server-cu12 cuopt-sh-client' -for FILE in conda/environments/*.yaml dependencies.yaml; do - for dependency in ${dependencies}; do - sed_runner "s/\(${dependency}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" - done +DEPENDENCIES=( + libcuopt + libcuopt-cu12 + cuopt-mps-parser + cuopt + cuopt-cu12 + cuopt-server + cuopt-server-cu12 + cuopt-sh-client + cudf + cudf-cu12 + cuvs + cuvs-cu12 + librmm + librmm-cu12 + libraft-headers + rmm + rmm-cu12 + pylibraft + pylibraft-cu12 + raft-dask + raft-dask-cu12 + rapids-dask-dependency +) + +for DEP in "${DEPENDENCIES[@]}"; do + for FILE in dependencies.yaml conda/environments/*.yaml python/*/pyproject.toml; do + sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" + done + for FILE in python/*/pyproject.toml; do + sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" + done + for FILE in docs/cuopt/source/*/quick-start.rst README.md; do + sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" "${FILE}" + done + for FILE in docs/cuopt/source/*/quick-start.rst README.md; do + sed_runner "s/\(${DEP}=\)[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?[^ ]*/\1${NEXT_SHORT_TAG}.*/g" "${FILE}" + done + for FILE in docs/cuopt/source/*/quick-start.rst README.md; do + sed_runner "s/\(${DEP}:\)[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda[0-9]\+\.[0-9]\+-\)\(py[0-9]\+\)/\1${DOCKER_TAG}\2\3/g" docs/cuopt/source/cuopt-python/quick-start.rst + done done # CMakeLists update sed_runner 's/'"VERSION [0-9][0-9].[0-9][0-9].[0-9][0-9]"'/'"VERSION ${NEXT_FULL_TAG}"'/g' cpp/CMakeLists.txt sed_runner 's/'"VERSION [0-9][0-9].[0-9][0-9].[0-9][0-9]"'/'"VERSION ${NEXT_FULL_TAG}"'/g' cpp/libmps_parser/CMakeLists.txt - -# RAPIDS CMakeLists update sed_runner 's/'"DEPENDENT_LIB_MAJOR_VERSION \"[0-9][0-9]\""'/'"DEPENDENT_LIB_MAJOR_VERSION \"${NEXT_MAJOR}\""'/g' cpp/CMakeLists.txt sed_runner 's/'"DEPENDENT_LIB_MINOR_VERSION \"[0-9][0-9]\""'/'"DEPENDENT_LIB_MINOR_VERSION \"${NEXT_MINOR}\""'/g' cpp/CMakeLists.txt @@ -61,22 +95,8 @@ sed_runner 's/'"\"client_version\": \"[0-9][0-9].[0-9][0-9]\""'/'"\"client_versi sed_runner 's/'"\"client_version\": \"[0-9][0-9].[0-9][0-9]\""'/'"\"client_version\": \"${NEXT_SHORT_TAG}\""'/g' python/cuopt_server/cuopt_server/utils/linear_programming/data_definition.py # Doc update - sed_runner 's/'"version = \"[0-9][0-9].[0-9][0-9]\""'/'"version = \"${NEXT_SHORT_TAG}\""'/g' docs/cuopt/source/conf.py sed_runner 's/'"PROJECT_NUMBER = [0-9][0-9].[0-9][0-9]"'/'"PROJECT_NUMBER = ${NEXT_SHORT_TAG}"'/g' cpp/doxygen/Doxyfile -# Update quick-start docs for conda -sed_runner 's/cuopt=[0-9][0-9].[0-9][0-9].[^ ]*/cuopt='${NEXT_SHORT_TAG}'.*/g' docs/cuopt/source/cuopt-python/quick-start.rst -sed_runner 's/libcuopt=[0-9][0-9].[0-9][0-9].[^ ]*/libcuopt='${NEXT_SHORT_TAG}'.*/g' docs/cuopt/source/cuopt-c/quick-start.rst -sed_runner 's/cuopt-server=[0-9][0-9].[0-9][0-9].[^ ]* cuopt-sh-client=[0-9][0-9].[0-9][0-9].[^ ]*/cuopt-server='${NEXT_SHORT_TAG}'.* cuopt-sh-client='${NEXT_SHORT_TAG}'.*/g' docs/cuopt/source/cuopt-server/quick-start.rst -# Update quick-start docs for pip -sed_runner "s/\(cuopt-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-python/quick-start.rst -sed_runner "s/\(libcuopt-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-c/quick-start.rst -sed_runner "s/\(cuopt-server-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-server/quick-start.rst -sed_runner "s/\(cuopt-sh-client==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" docs/cuopt/source/cuopt-server/quick-start.rst - -# Update docker image tags in docs -sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' docs/cuopt/source/cuopt-python/quick-start.rst -sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' docs/cuopt/source/cuopt-server/quick-start.rst # Update project.json PROJECT_FILE="docs/cuopt/source/project.json" @@ -104,39 +124,11 @@ sed_runner "/^set(cuopt_version/ s/[0-9][0-9].[0-9][0-9].[0-9][0-9]/${NEXT_FULL_ # Update nightly sed_runner 's/'"cuopt_version: \"[0-9][0-9].[0-9][0-9]\""'/'"cuopt_version: \"${NEXT_SHORT_TAG}\""'/g' .github/workflows/nightly.yaml -# Update README.md -sed_runner "s/\(cuopt-server-cu12==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" README.md -sed_runner "s/\(cuopt-sh-client==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" README.md -sed_runner 's/cuopt-server=[0-9][0-9].[0-9][0-9].* cuopt-sh-client=[0-9][0-9].[0-9][0-9].*/cuopt-server='${NEXT_SHORT_TAG}' cuopt-sh-client='${NEXT_SHORT_TAG}'/g' README.md -sed_runner 's|cuopt:[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda12\.8-\)\(py[0-9]\+\)|cuopt:'"${DOCKER_TAG}"'\1\2|g' README.md - # Update Helm chart files sed_runner 's/\(tag: "\)[0-9][0-9]\.[0-9]\+\.[0-9]\+\(-cuda12\.8-py3\.12"\)/\1'${DOCKER_TAG}'\2/g' helmchart/cuopt-server/values.yaml sed_runner 's/\(appVersion: \)[0-9][0-9]\.[0-9]\+\.[0-9]\+/\1'${DOCKER_TAG}'/g' helmchart/cuopt-server/Chart.yaml sed_runner 's/\(version: \)[0-9][0-9]\.[0-9]\+\.[0-9]\+/\1'${DOCKER_TAG}'/g' helmchart/cuopt-server/Chart.yaml -DEPENDENCIES=( - libcuopt - cuopt - cuopt-mps-parser -) - -for DEP in "${DEPENDENCIES[@]}"; do - for FILE in python/*/pyproject.toml; do - sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" - done -done - -# RAPIDS-specific updates -# RTD update for RAPIDS dependencies -rapids_dependencies='cudf cudf-cu12 cuvs cuvs-cu12 libcudf librmm librmm-cu12 rmm rmm-cu12 librmm libraft-headers pylibraft pylibraft-cu12 raft-dask raft-dask-cu12 rapids-dask-dependency' -for FILE in conda/environments/*.yaml dependencies.yaml; do - for dependency in ${rapids_dependencies}; do - sed_runner "s/\(${dependency}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" - done -done - -# WORKFLOWS for RAPIDS for FILE in .github/workflows/*.yaml; do sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" # CI image tags of the form {rapids_version}-{something} @@ -148,24 +140,4 @@ sed_runner 's/'"DEPENDENT_PACKAGE_VERSION=\"[0-9][0-9].[0-9][0-9]\""'/'"DEPENDEN sed_runner 's/'"DEPENDENT_PACKAGE_VERSION=\"[0-9][0-9].[0-9][0-9]\""'/'"DEPENDENT_PACKAGE_VERSION=\"${NEXT_SHORT_TAG}\""'/g' ci/build_python.sh # PYTHON for RAPIDS -sed_runner "/DOWNLOAD.*rapids-cmake/ s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/g" python/cuopt/CMakeLists.txt - -# Fixing RAPIDS dependencies and pyproject.toml -RAPIDS_DEPENDENCIES=( - cudf - cuvs - librmm - rmm - pylibraft - raft-dask - rapids-dask-dependency -) - -for DEP in "${RAPIDS_DEPENDENCIES[@]}"; do - for FILE in dependencies.yaml conda/environments/*.yaml; do - sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" - done - for FILE in python/*/pyproject.toml; do - sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" - done -done +sed_runner "/DOWNLOAD.*rapids-cmake/ s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/g" python/cuopt/CMakeLists.txt \ No newline at end of file From c2fa99ac19227f84869df69abaebc44204909bce Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Fri, 15 Aug 2025 09:31:59 -0500 Subject: [PATCH 08/12] address review changes --- .pre-commit-config.yaml | 2 -- ci/release/update-version.sh | 33 ++++++++++----------------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 31d21ee02c..e9e1abedc8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,10 +18,8 @@ repos: rev: 'v5.0.0' hooks: - id: end-of-file-fixer - files: \.(mps|json|yaml|yml|txt)$ exclude: ^(datasets|helmchart)/.*\.(mps|json|yaml|yml|txt)$ - id: trailing-whitespace - files: \.(mps|json|yaml|yml|txt)$ exclude: ^datasets/.*\.(mps|json|yaml|yml|txt)$ - id: check-builtin-literals - id: check-executables-have-shebangs diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 5fa44cb532..4a2db8a6fa 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -37,32 +37,23 @@ function sed_runner() { } # Centralized version file update -echo "${NEXT_FULL_TAG}" > VERSION -echo "${NEXT_FULL_TAG}" > RAPIDS_VERSION +echo "${NEXT_FULL_TAG}" > ./VERSION +echo "${NEXT_FULL_TAG}" > ./RAPIDS_VERSION DEPENDENCIES=( - libcuopt - libcuopt-cu12 - cuopt-mps-parser + cudf + cuvs cuopt - cuopt-cu12 + cuopt-mps-parser cuopt-server - cuopt-server-cu12 cuopt-sh-client - cudf - cudf-cu12 - cuvs - cuvs-cu12 - librmm - librmm-cu12 + libcuopt libraft-headers - rmm - rmm-cu12 + librmm pylibraft - pylibraft-cu12 raft-dask - raft-dask-cu12 rapids-dask-dependency + rmm ) for DEP in "${DEPENDENCIES[@]}"; do @@ -70,16 +61,12 @@ for DEP in "${DEPENDENCIES[@]}"; do sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" done for FILE in python/*/pyproject.toml; do - sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+/\1${NEXT_SHORT_TAG_PEP440}/" "${FILE}" + sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}\(\[.*\]\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}" done for FILE in docs/cuopt/source/*/quick-start.rst README.md; do sed_runner "s/\(${DEP}==\)[0-9]\+\.[0-9]\+\.\\*/\1${NEXT_SHORT_TAG_PEP440}.\*/g" "${FILE}" - done - for FILE in docs/cuopt/source/*/quick-start.rst README.md; do sed_runner "s/\(${DEP}=\)[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?[^ ]*/\1${NEXT_SHORT_TAG}.*/g" "${FILE}" - done - for FILE in docs/cuopt/source/*/quick-start.rst README.md; do - sed_runner "s/\(${DEP}:\)[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda[0-9]\+\.[0-9]\+-\)\(py[0-9]\+\)/\1${DOCKER_TAG}\2\3/g" docs/cuopt/source/cuopt-python/quick-start.rst + sed_runner "s/\(${DEP}:\)[0-9]\{2\}\.[0-9]\{1,2\}\.[0-9]\+\(-cuda[0-9]\+\.[0-9]\+-\)\(py[0-9]\+\)/\1${DOCKER_TAG}\2\3/g" "${FILE}" done done From 97743d30f2dc5de81570da38b649dd1e68cac682 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Fri, 15 Aug 2025 09:35:11 -0500 Subject: [PATCH 09/12] address review comments --- ci/build_cpp.sh | 4 +++- ci/build_python.sh | 6 ++++-- ci/release/update-version.sh | 4 ---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 5127b0f568..d4f619a547 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -32,7 +32,9 @@ sccache --zero-stats RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) export RAPIDS_PACKAGE_VERSION -export DEPENDENT_PACKAGE_VERSION="25.10" + +DEPENDENT_PACKAGE_VERSION=$(cat ./RAPIDS_VERSION) +export DEPENDENT_PACKAGE_VERSION # populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array source rapids-rattler-channel-string diff --git a/ci/build_python.sh b/ci/build_python.sh index 4ca25cf33a..2e1eef1fdb 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -29,8 +29,10 @@ CPP_CHANNEL=$(rapids-download-conda-from-github cpp) version=$(rapids-generate-version) export RAPIDS_PACKAGE_VERSION=${version} -export DEPENDENT_PACKAGE_VERSION="25.10" -echo "${version}" > VERSION +DEPENDENT_PACKAGE_VERSION=$(cat ./RAPIDS_VERSION) +export DEPENDENT_PACKAGE_VERSION + +echo "${version}" > ./VERSION git_commit=$(git rev-parse HEAD) package_dir="python" diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 4a2db8a6fa..7bcaafb659 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -122,9 +122,5 @@ for FILE in .github/workflows/*.yaml; do sed_runner "s/:[0-9]*\\.[0-9]*-/:${NEXT_SHORT_TAG}-/g" "${FILE}" done -# CI for RAPIDS -sed_runner 's/'"DEPENDENT_PACKAGE_VERSION=\"[0-9][0-9].[0-9][0-9]\""'/'"DEPENDENT_PACKAGE_VERSION=\"${NEXT_SHORT_TAG}\""'/g' ci/build_cpp.sh -sed_runner 's/'"DEPENDENT_PACKAGE_VERSION=\"[0-9][0-9].[0-9][0-9]\""'/'"DEPENDENT_PACKAGE_VERSION=\"${NEXT_SHORT_TAG}\""'/g' ci/build_python.sh - # PYTHON for RAPIDS sed_runner "/DOWNLOAD.*rapids-cmake/ s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/g" python/cuopt/CMakeLists.txt \ No newline at end of file From ce3f525a3cd0bffd71c7fd1825864e7d5c14fbd9 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Fri, 15 Aug 2025 09:38:31 -0500 Subject: [PATCH 10/12] pre commit changes --- ci/release/update-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 7bcaafb659..3d5b1f2413 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -123,4 +123,4 @@ for FILE in .github/workflows/*.yaml; do done # PYTHON for RAPIDS -sed_runner "/DOWNLOAD.*rapids-cmake/ s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/g" python/cuopt/CMakeLists.txt \ No newline at end of file +sed_runner "/DOWNLOAD.*rapids-cmake/ s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/g" python/cuopt/CMakeLists.txt From 5eed69ec82a43ff18033b9ebd51b31305d385edb Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Fri, 15 Aug 2025 09:39:19 -0500 Subject: [PATCH 11/12] revert precommit file changes, this will be another PR --- .pre-commit-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e9e1abedc8..5c599c60ee 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,8 +18,10 @@ repos: rev: 'v5.0.0' hooks: - id: end-of-file-fixer + files: \.(mps|json|yaml|yml|txt)$ exclude: ^(datasets|helmchart)/.*\.(mps|json|yaml|yml|txt)$ - id: trailing-whitespace + files: \.(mps|json|yaml|yml|txt)$ exclude: ^datasets/.*\.(mps|json|yaml|yml|txt)$ - id: check-builtin-literals - id: check-executables-have-shebangs From 85ebc9adaa6e27141e2a62e6d5d6b5999c74bbb4 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Fri, 15 Aug 2025 09:48:32 -0500 Subject: [PATCH 12/12] fix --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5c599c60ee..31d21ee02c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: rev: 'v5.0.0' hooks: - id: end-of-file-fixer - files: \.(mps|json|yaml|yml|txt)$ + files: \.(mps|json|yaml|yml|txt)$ exclude: ^(datasets|helmchart)/.*\.(mps|json|yaml|yml|txt)$ - id: trailing-whitespace files: \.(mps|json|yaml|yml|txt)$