Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove versioning workaround for nightlies #69

Merged
merged 2 commits into from
Nov 15, 2024
Merged

remove versioning workaround for nightlies #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c703264
remove versioning workaround for nightlies
jameslamb Nov 15, 2024
41db108
Add workflows to update-version.sh
raydouglass Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ci/build_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ export CMAKE_GENERATOR=Ninja

rapids-print-env

# TODO: revert this once we start publishing nightly packages
# from the 'cugraph-gnn' repo and stop publishing them from
# the 'cugraph' / 'wholegraph' repos
#version=$(rapids-generate-version)
version="24.12.00a1000"
version=$(rapids-generate-version)

rapids-logger "Begin cpp build"

Expand Down
6 changes: 1 addition & 5 deletions ci/build_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ rapids-print-env

CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

# TODO: revert this once we start publishing nightly packages
# from the 'cugraph-gnn' repo and stop publishing them from
# the 'cugraph' / 'wholegraph' repos
# rapids-generate-version > ./VERSION
echo "24.12.00a1000" > ./VERSION
rapids-generate-version > ./VERSION

sccache --zero-stats

Expand Down
5 changes: 5 additions & 0 deletions ci/release/update-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,8 @@ for DEP in "${DEPENDENCIES[@]}"; do
done

sed_runner "s/\(PROJECT_NUMBER[[:space:]]*\)=.*/\1= ${NEXT_SHORT_TAG}/" cpp/Doxyfile

# CI files
for FILE in .github/workflows/*.yaml; do
sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
done
5 changes: 1 addition & 4 deletions ci/test_notebooks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,11 @@ rapids-logger "Downloading artifacts from previous jobs"
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)

# TODO: remove the '>=24.12.00a1000' once we start publishing nightly packages
# from the 'cugraph-gnn' repo and stop publishing them from
# the 'cugraph' / 'wholegraph' repos
rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
--channel dglteam/label/th23_cu118 \
"cugraph-dgl=${RAPIDS_VERSION},>=24.12.00a1000"
"cugraph-dgl=${RAPIDS_VERSION}"

NBTEST="$(realpath "$(dirname "$0")/utils/nbtest.sh")"
NOTEBOOK_LIST="$(realpath "$(dirname "$0")/notebook_list.py")"
Expand Down
19 changes: 5 additions & 14 deletions ci/test_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,15 @@ if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
fi


# TODO: remove the '>=24.12.00a1000' once we start publishing nightly packages
# from the 'cugraph-gnn' repo and stop publishing them from
# the 'cugraph' / 'wholegraph' repos
rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
--channel pytorch \
--channel conda-forge \
--channel "${DGL_CHANNEL}" \
--channel nvidia \
"pylibwholegraph=${RAPIDS_VERSION},>=24.12.00a1000" \
"cugraph-dgl=${RAPIDS_VERSION},>=24.12.00a1000" \
"pylibwholegraph=${RAPIDS_VERSION}" \
"cugraph-dgl=${RAPIDS_VERSION}" \
'pytorch::pytorch>=2.3,<2.4' \
"ogb"

Expand Down Expand Up @@ -108,15 +105,12 @@ if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
conda activate test_cugraph_pyg
set -u

# TODO: remove the '>=24.12.00a1000' once we start publishing nightly packages
# from the 'cugraph-gnn' repo and stop publishing them from
# the 'cugraph' / 'wholegraph' repos
rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
--channel pytorch \
"pylibwholegraph=${RAPIDS_VERSION},>=24.12.00a1000" \
"cugraph-pyg=${RAPIDS_VERSION},>=24.12.00a1000" \
"pylibwholegraph=${RAPIDS_VERSION}" \
"cugraph-pyg=${RAPIDS_VERSION}" \
'pytorch::pytorch>=2.3,<2.4' \
'ogb'

Expand Down Expand Up @@ -149,15 +143,12 @@ if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
conda activate test_pylibwholegraph
set -u

# TODO: remove the '>=24.12.00a1000' once we start publishing nightly packages
# from the 'cugraph-gnn' repo and stop publishing them from
# the 'cugraph' / 'wholegraph' repos
rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
--channel pytorch \
'mkl<2024.1.0' \
"pylibwholegraph=${RAPIDS_VERSION},>=24.12.00a1000" \
"pylibwholegraph=${RAPIDS_VERSION}" \
'pytorch::pytorch>=2.3,<2.4' \
'pytest-forked' \
'ogb'
Expand Down
Loading