Merge branch 'main' of github.com:rapidsai/cumlprims_mg into fea/use-sccache-build-cluster

Author: trxcllnt

README.md

@@ -93,7 +93,7 @@ $ make install
 
 4. Tests are optional currently, and can currently be run with CUDA aware MPI installed only. They are meant for development mainly currently (will be enabled in CI in the future). To test full end-to-end functionality of the `libcumlprims` package, the pytests of main cuML need to be run.
 
-To do that, first build (and install) `libcumlprims`, and then refer to [cuML's build guide](https://github.com/rapidsai/cuml/blob/branch-0.14/BUILD.md). After building `libcuml++` and the python package `cuml`, the pytests under `python/cuml/test/dask` will run unit tests of the algorithms that use `libcumlprims`.
+To do that, first build (and install) `libcumlprims`, and then refer to [cuML's build guide](https://github.com/rapidsai/cuml/blob/main/BUILD.md). After building `libcuml++` and the python package `cuml`, the pytests under `python/cuml/test/dask` will run unit tests of the algorithms that use `libcumlprims`.
 
 ### Code Style
 

ci/release/update-version.sh

@@ -6,8 +6,66 @@
 ########################
 
 ## Usage
-# bash update-version.sh <new_version>
+# Primary interface: ./ci/release/update-version.sh --run-context=main|release <new_version>
+# Fallback: Environment variable support for automation needs
+# NOTE: Must be run from the root of the repository
+#
+# CLI args take precedence when both are provided
+# If neither RUN_CONTEXT nor --run-context is provided, defaults to main
+#
+# Examples:
+#   ./ci/release/update-version.sh --run-context=main 25.12.00
+#   ./ci/release/update-version.sh --run-context=release 25.12.00
+#   RAPIDS_RUN_CONTEXT=main ./ci/release/update-version.sh 25.12.00
 
+# Verify we're running from the repository root
+if [[ ! -f "VERSION" ]] || [[ ! -f "ci/release/update-version.sh" ]] || [[ ! -d "cpp" ]]; then
+    echo "Error: This script must be run from the root of the cumlprims_mg repository"
+    echo ""
+    echo "Usage:"
+    echo "  cd /path/to/cumlprims_mg"
+    echo "  ./ci/release/update-version.sh --run-context=main|release <new_version>"
+    echo ""
+    echo "Example:"
+    echo "  ./ci/release/update-version.sh --run-context=main 25.12.00"
+    exit 1
+fi
+
+# Parse command line arguments
+POSITIONAL_ARGS=()
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --run-context=*)
+      CLI_RUN_CONTEXT="${1#*=}"
+      shift
+      ;;
+    *)
+      POSITIONAL_ARGS+=("$1")
+      shift
+      ;;
+  esac
+done
+
+# Restore positional parameters
+set -- "${POSITIONAL_ARGS[@]}"
+
+# Determine RUN_CONTEXT with precedence: CLI > Environment > Default
+if [[ -n "${CLI_RUN_CONTEXT:-}" ]]; then
+    RUN_CONTEXT="${CLI_RUN_CONTEXT}"
+    echo "Using run-context from CLI: ${RUN_CONTEXT}"
+elif [[ -n "${RAPIDS_RUN_CONTEXT:-}" ]]; then
+    RUN_CONTEXT="${RAPIDS_RUN_CONTEXT}"
+    echo "Using RUN_CONTEXT from environment: ${RUN_CONTEXT}"
+else
+    RUN_CONTEXT="main"
+    echo "Using default run-context: ${RUN_CONTEXT}"
+fi
+
+# Validate RUN_CONTEXT
+if [[ "${RUN_CONTEXT}" != "main" && "${RUN_CONTEXT}" != "release" ]]; then
+    echo "Error: Invalid run-context '${RUN_CONTEXT}'. Must be 'main' or 'release'"
+    exit 1
+fi
 
 # Format is YY.MM.PP - no leading 'v' or trailing 'a'
 NEXT_FULL_TAG=$1
@@ -27,7 +85,14 @@ NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
 # Need to distutils-normalize the original version
 NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))")
 
-echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"
+# Determine branch name based on context
+if [[ "${RUN_CONTEXT}" == "main" ]]; then
+    RAPIDS_BRANCH_NAME="main"
+    echo "Preparing development branch update ${CURRENT_TAG} => ${NEXT_FULL_TAG} (targeting main branch)"
+elif [[ "${RUN_CONTEXT}" == "release" ]]; then
+    RAPIDS_BRANCH_NAME="release/${NEXT_SHORT_TAG}"
+    echo "Preparing release branch update ${CURRENT_TAG} => ${NEXT_FULL_TAG} (targeting release/${NEXT_SHORT_TAG} branch)"
+fi
 
 # Inplace sed replace; workaround for Linux and Mac
 function sed_runner() {
@@ -36,7 +101,7 @@ function sed_runner() {
 
 # Centralized version file update
 echo "${NEXT_FULL_TAG}" > VERSION
-echo "branch-${NEXT_SHORT_TAG}" > RAPIDS_BRANCH
+echo "${RAPIDS_BRANCH_NAME}" > RAPIDS_BRANCH
 
 DEPENDENCIES=(
   libraft-headers
@@ -48,10 +113,20 @@ for DEP in "${DEPENDENCIES[@]}"; do
   done
 done
 
+# CI files - context-aware branch references
 for FILE in .github/workflows/*.yaml; do
-  sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
+  sed_runner "/shared-workflows/ s|@.*|@${RAPIDS_BRANCH_NAME}|g" "${FILE}"
 done
 
+# Documentation references - context-aware
+if [[ "${RUN_CONTEXT}" == "main" ]]; then
+  # In main context, keep documentation on main (no changes needed)
+  :
+elif [[ "${RUN_CONTEXT}" == "release" ]]; then
+  # In release context, use release branch for documentation links (word boundaries to avoid partial matches)
+  sed_runner "s|\\bmain\\b|release/${NEXT_SHORT_TAG}|g" README.md
+fi
+
 # .devcontainer files
 find .devcontainer/ -type f -name devcontainer.json -print0 | while IFS= read -r -d '' filename; do
     sed_runner "s@rapidsai/devcontainers:[0-9.]*@rapidsai/devcontainers:${NEXT_SHORT_TAG}@g" "${filename}"

cpp/src_prims_opg/matrix/matrix_utils.cu

@@ -7,7 +7,7 @@
 #include <cumlprims/opg/matrix/matrix_utils.hpp>
 #include <raft/linalg/transpose.cuh>
 #include <rmm/device_uvector.hpp>
-#include <rmm/mr/device/per_device_resource.hpp>
+#include <rmm/mr/per_device_resource.hpp>
 
 namespace MLCommon {
 namespace Matrix {