Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into algo-list
Browse files Browse the repository at this point in the history
  • Loading branch information
nv-rliu authored Jan 9, 2025
2 parents 950295a + 762731b commit 11be771
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 642 deletions.
9 changes: 2 additions & 7 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
# Order matters - match of highest importance goes last (last match wins)

#doc code owners
datasets/ @rapidsai/cugraph-doc-codeowners
notebooks/ @rapidsai/cugraph-doc-codeowners
# doc code owners
docs/ @rapidsai/cugraph-doc-codeowners
**/*.txt @rapidsai/cugraph-doc-codeowners
**/*.md @rapidsai/cugraph-doc-codeowners
**/*.rst @rapidsai/cugraph-doc-codeowners
**/*.ipynb @rapidsai/cugraph-doc-codeowners
**/*.pdf @rapidsai/cugraph-doc-codeowners
**/*.png @rapidsai/cugraph-doc-codeowners


#CI code owners
# CI code owners
/.github/ @rapidsai/ci-codeowners
/ci/ @rapidsai/ci-codeowners
/.pre-commit-config.yaml @rapidsai/ci-codeowners
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ repos:
- repo: https://github.com/rapidsai/pre-commit-hooks
rev: v0.4.0
hooks:
- id: verify-alpha-spec
- id: verify-copyright
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.17.0
Expand Down
25 changes: 1 addition & 24 deletions ci/build_docs.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#!/bin/bash
# Copyright (c) 2023-2024, NVIDIA CORPORATION.
# Copyright (c) 2023-2025, NVIDIA CORPORATION.

set -euo pipefail

rapids-logger "Create test conda environment"
. /opt/conda/etc/profile.d/conda.sh

RAPIDS_VERSION="$(rapids-version)"
RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"

rapids-dependency-file-generator \
Expand All @@ -21,28 +20,6 @@ export RAPIDS_DOCS_DIR="$(mktemp -d)"

rapids-print-env

if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
DGL_CHANNEL="dglteam/label/cu118"
else
DGL_CHANNEL="dglteam/label/cu121"
fi

rapids-mamba-retry install \
--channel conda-forge \
--channel pyg \
--channel nvidia \
--channel "${DGL_CHANNEL}" \
"libcugraph==${RAPIDS_VERSION}.*" \
"pylibcugraph=${RAPIDS_VERSION}.*" \
"cugraph=${RAPIDS_VERSION}.*" \
"cugraph-pyg=${RAPIDS_VERSION}.*" \
"cugraph-dgl=${RAPIDS_VERSION}.*" \
"libcugraph_etl=${RAPIDS_VERSION}.*" \
"pylibcugraphops=${RAPIDS_VERSION}.*" \
"pylibwholegraph=${RAPIDS_VERSION}.*" \
pytorch \
"cuda-version=${RAPIDS_CUDA_VERSION%.*}"

PROJ_LIST=("libcugraph libcugraphops libwholegraph")

for PROJECT in ${PROJ_LIST}; do
Expand Down
27 changes: 6 additions & 21 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
# Copyright (c) 2018-2025, NVIDIA CORPORATION.
# 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
Expand Down Expand Up @@ -30,7 +30,6 @@ CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
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}
NEXT_UCX_PY_VERSION="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG})"

echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"

Expand All @@ -42,40 +41,26 @@ function sed_runner() {
# Centralized version file update
# NOTE: Any script that runs in CI will need to use gha-tool `rapids-generate-version`
# and echo it to `VERSION` file to get an alpha spec of the current version
echo "${NEXT_FULL_TAG}" > VERSION
echo "${NEXT_FULL_TAG}" > ./VERSION

# Need to distutils-normalize the original version
NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))")

DEPENDENCIES=(
cudf
cugraph
cugraph-dgl
cugraph-pyg
cugraph-service-server
cugraph-service-client
cuxfilter
dask-cuda
dask-cudf
libcudf
libcugraph
libcugraph_etl
libcugraphops
libraft
libraft-headers
librmm
nx-cugraph
pylibcugraph
pylibcugraphops
pylibwholegraph
pylibraft
pyraft
raft-dask
rmm
ucx-py
rapids-dask-dependency
)
for DEP in "${DEPENDENCIES[@]}"; do
for FILE in dependencies.yaml conda/environments/*.yaml; do
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}"
sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*/g" "${FILE}"
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
done
done

Expand Down
158 changes: 0 additions & 158 deletions ci/utils/git_helpers.py

This file was deleted.

76 changes: 0 additions & 76 deletions ci/utils/nbtest.sh

This file was deleted.

Loading

0 comments on commit 11be771

Please sign in to comment.