Skip to content

Commit 9ad7389

Browse files
jameslambjameslamb
authored
handle more RAPIDS version formats in update-version.sh, refactor dependencies.yaml (#4109)
Contributes to rapidsai/build-planning#13. Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`. This also pulls in some dependency refactoring originally added in #4088, which allows greater use of dependencies.yaml globs (and therefore less maintenance effort to support new CUDA versions). Authors: - James Lamb (https://github.com/jameslamb) - Brad Rees (https://github.com/BradReesWork) - Ray Douglass (https://github.com/raydouglass) - Bradley Dice (https://github.com/bdice) Approvers: - Jake Awe (https://github.com/AyodeAwe) - Bradley Dice (https://github.com/bdice) - Brad Rees (https://github.com/BradReesWork) - Rick Ratzel (https://github.com/rlratzel) URL: #4109
1 parent f9e618b commit 9ad7389

File tree

2 files changed

+38
-97
lines changed

2 files changed

+38
-97
lines changed

‎ci/release/update-version.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
55
# You may obtain a copy of the License at
@@ -96,13 +96,12 @@ DEPENDENCIES=(
9696
)
9797
for DEP in "${DEPENDENCIES[@]}"; do
9898
for FILE in dependencies.yaml conda/environments/*.yaml python/cugraph-{pyg,dgl}/conda/*.yaml; do
99-
sed_runner "/-.* ${DEP}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" ${FILE}
100-
sed_runner "/-.* ${DEP}-cu[0-9][0-9]==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" ${FILE}
101-
sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*/g" ${FILE}
99+
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}"
100+
sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*/g" "${FILE}"
102101
done
103102
for FILE in python/**/pyproject.toml python/**/**/pyproject.toml; do
104-
sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*\"/g" ${FILE}
105-
sed_runner "/\"ucx-py==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*\"/g" ${FILE}
103+
sed_runner "/\"${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*\"/g" "${FILE}"
104+
sed_runner "/\"ucx-py==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*\"/g" "${FILE}"
106105
done
107106
done
108107

‎dependencies.yaml

+33-91
Original file line numberDiff line numberDiff line change
@@ -567,17 +567,12 @@ dependencies:
567567
specific:
568568
- output_types: [requirements, pyproject]
569569
matrices:
570-
- matrix: {cuda: "12.2"}
571-
packages: &rmm_packages_pip_cu12
570+
- matrix: {cuda: "12.*"}
571+
packages:
572572
- rmm-cu12==24.4.*
573-
- {matrix: {cuda: "12.1"}, packages: *rmm_packages_pip_cu12}
574-
- {matrix: {cuda: "12.0"}, packages: *rmm_packages_pip_cu12}
575-
- matrix: {cuda: "11.8"}
576-
packages: &rmm_packages_pip_cu11
573+
- matrix: {cuda: "11.*"}
574+
packages:
577575
- rmm-cu11==24.4.*
578-
- {matrix: {cuda: "11.5"}, packages: *rmm_packages_pip_cu11}
579-
- {matrix: {cuda: "11.4"}, packages: *rmm_packages_pip_cu11}
580-
- {matrix: {cuda: "11.2"}, packages: *rmm_packages_pip_cu11}
581576
- {matrix: null, packages: [*rmm_conda]}
582577

583578
depends_on_cudf:
@@ -593,17 +588,12 @@ dependencies:
593588
specific:
594589
- output_types: [requirements, pyproject]
595590
matrices:
596-
- matrix: {cuda: "12.2"}
597-
packages: &cudf_packages_pip_cu12
591+
- matrix: {cuda: "12.*"}
592+
packages:
598593
- cudf-cu12==24.4.*
599-
- {matrix: {cuda: "12.1"}, packages: *cudf_packages_pip_cu12}
600-
- {matrix: {cuda: "12.0"}, packages: *cudf_packages_pip_cu12}
601-
- matrix: {cuda: "11.8"}
602-
packages: &cudf_packages_pip_cu11
594+
- matrix: {cuda: "11.*"}
595+
packages:
603596
- cudf-cu11==24.4.*
604-
- {matrix: {cuda: "11.5"}, packages: *cudf_packages_pip_cu11}
605-
- {matrix: {cuda: "11.4"}, packages: *cudf_packages_pip_cu11}
606-
- {matrix: {cuda: "11.2"}, packages: *cudf_packages_pip_cu11}
607597
- {matrix: null, packages: [*cudf_conda]}
608598

609599
depends_on_dask_cudf:
@@ -619,17 +609,12 @@ dependencies:
619609
specific:
620610
- output_types: [requirements, pyproject]
621611
matrices:
622-
- matrix: {cuda: "12.2"}
623-
packages: &dask_cudf_packages_pip_cu12
612+
- matrix: {cuda: "12.*"}
613+
packages:
624614
- dask-cudf-cu12==24.4.*
625-
- {matrix: {cuda: "12.1"}, packages: *dask_cudf_packages_pip_cu12}
626-
- {matrix: {cuda: "12.0"}, packages: *dask_cudf_packages_pip_cu12}
627-
- matrix: {cuda: "11.8"}
628-
packages: &dask_cudf_packages_pip_cu11
615+
- matrix: {cuda: "11.*"}
616+
packages:
629617
- dask-cudf-cu11==24.4.*
630-
- {matrix: {cuda: "11.5"}, packages: *dask_cudf_packages_pip_cu11}
631-
- {matrix: {cuda: "11.4"}, packages: *dask_cudf_packages_pip_cu11}
632-
- {matrix: {cuda: "11.2"}, packages: *dask_cudf_packages_pip_cu11}
633618
- {matrix: null, packages: [*dask_cudf_conda]}
634619

635620
depends_on_pylibraft:
@@ -645,17 +630,12 @@ dependencies:
645630
specific:
646631
- output_types: [requirements, pyproject]
647632
matrices:
648-
- matrix: {cuda: "12.2"}
649-
packages: &pylibraft_packages_pip_cu12
633+
- matrix: {cuda: "12.*"}
634+
packages:
650635
- pylibraft-cu12==24.4.*
651-
- {matrix: {cuda: "12.1"}, packages: *pylibraft_packages_pip_cu12}
652-
- {matrix: {cuda: "12.0"}, packages: *pylibraft_packages_pip_cu12}
653-
- matrix: {cuda: "11.8"}
654-
packages: &pylibraft_packages_pip_cu11
636+
- matrix: {cuda: "11.*"}
637+
packages:
655638
- pylibraft-cu11==24.4.*
656-
- {matrix: {cuda: "11.5"}, packages: *pylibraft_packages_pip_cu11}
657-
- {matrix: {cuda: "11.4"}, packages: *pylibraft_packages_pip_cu11}
658-
- {matrix: {cuda: "11.2"}, packages: *pylibraft_packages_pip_cu11}
659639
- {matrix: null, packages: [*pylibraft_conda]}
660640

661641
depends_on_raft_dask:
@@ -671,17 +651,12 @@ dependencies:
671651
specific:
672652
- output_types: [requirements, pyproject]
673653
matrices:
674-
- matrix: {cuda: "12.2"}
675-
packages: &raft_dask_packages_pip_cu12
654+
- matrix: {cuda: "12.*"}
655+
packages:
676656
- raft-dask-cu12==24.4.*
677-
- {matrix: {cuda: "12.1"}, packages: *raft_dask_packages_pip_cu12}
678-
- {matrix: {cuda: "12.0"}, packages: *raft_dask_packages_pip_cu12}
679-
- matrix: {cuda: "11.8"}
680-
packages: &raft_dask_packages_pip_cu11
657+
- matrix: {cuda: "11.*"}
658+
packages:
681659
- raft-dask-cu11==24.4.*
682-
- {matrix: {cuda: "11.5"}, packages: *raft_dask_packages_pip_cu11}
683-
- {matrix: {cuda: "11.4"}, packages: *raft_dask_packages_pip_cu11}
684-
- {matrix: {cuda: "11.2"}, packages: *raft_dask_packages_pip_cu11}
685660
- {matrix: null, packages: [*raft_dask_conda]}
686661

687662
depends_on_pylibcugraph:
@@ -697,17 +672,12 @@ dependencies:
697672
specific:
698673
- output_types: [requirements, pyproject]
699674
matrices:
700-
- matrix: {cuda: "12.2"}
701-
packages: &pylibcugraph_packages_pip_cu12
675+
- matrix: {cuda: "12.*"}
676+
packages:
702677
- pylibcugraph-cu12==24.4.*
703-
- {matrix: {cuda: "12.1"}, packages: *pylibcugraph_packages_pip_cu12}
704-
- {matrix: {cuda: "12.0"}, packages: *pylibcugraph_packages_pip_cu12}
705-
- matrix: {cuda: "11.8"}
706-
packages: &pylibcugraph_packages_pip_cu11
678+
- matrix: {cuda: "11.*"}
679+
packages:
707680
- pylibcugraph-cu11==24.4.*
708-
- {matrix: {cuda: "11.5"}, packages: *pylibcugraph_packages_pip_cu11}
709-
- {matrix: {cuda: "11.4"}, packages: *pylibcugraph_packages_pip_cu11}
710-
- {matrix: {cuda: "11.2"}, packages: *pylibcugraph_packages_pip_cu11}
711681
- {matrix: null, packages: [*pylibcugraph_conda]}
712682

713683
depends_on_pylibcugraphops:
@@ -723,17 +693,12 @@ dependencies:
723693
specific:
724694
- output_types: [requirements, pyproject]
725695
matrices:
726-
- matrix: {cuda: "12.2"}
727-
packages: &pylibcugraphops_packages_pip_cu12
696+
- matrix: {cuda: "12.*"}
697+
packages:
728698
- pylibcugraphops-cu12==24.4.*
729-
- {matrix: {cuda: "12.1"}, packages: *pylibcugraphops_packages_pip_cu12}
730-
- {matrix: {cuda: "12.0"}, packages: *pylibcugraphops_packages_pip_cu12}
731-
- matrix: {cuda: "11.8"}
732-
packages: &pylibcugraphops_packages_pip_cu11
699+
- matrix: {cuda: "11.*"}
700+
packages:
733701
- pylibcugraphops-cu11==24.4.*
734-
- {matrix: {cuda: "11.5"}, packages: *pylibcugraphops_packages_pip_cu11}
735-
- {matrix: {cuda: "11.4"}, packages: *pylibcugraphops_packages_pip_cu11}
736-
- {matrix: {cuda: "11.2"}, packages: *pylibcugraphops_packages_pip_cu11}
737702
- {matrix: null, packages: [*pylibcugraphops_conda]}
738703

739704
depends_on_cupy:
@@ -744,33 +709,10 @@ dependencies:
744709
specific:
745710
- output_types: [requirements, pyproject]
746711
matrices:
747-
# All CUDA 12 + x86_64 versions
748-
- matrix: {cuda: "12.2", arch: x86_64}
749-
packages: &cupy_packages_cu12_x86_64
712+
- matrix: {cuda: "12.*"}
713+
packages:
750714
- cupy-cuda12x>=12.0.0
751-
- {matrix: {cuda: "12.1", arch: x86_64}, packages: *cupy_packages_cu12_x86_64}
752-
- {matrix: {cuda: "12.0", arch: x86_64}, packages: *cupy_packages_cu12_x86_64}
753-
754-
# All CUDA 12 + aarch64 versions
755-
- matrix: {cuda: "12.2", arch: aarch64}
756-
packages: &cupy_packages_cu12_aarch64
757-
- cupy-cuda12x -f https://pip.cupy.dev/aarch64 # TODO: Verify that this works.
758-
- {matrix: {cuda: "12.1", arch: aarch64}, packages: *cupy_packages_cu12_aarch64}
759-
- {matrix: {cuda: "12.0", arch: aarch64}, packages: *cupy_packages_cu12_aarch64}
760-
761-
# All CUDA 11 + x86_64 versions
762-
- matrix: {cuda: "11.8", arch: x86_64}
763-
packages: &cupy_packages_cu11_x86_64
715+
- matrix: {cuda: "11.*"}
716+
packages: &cupy_packages_cu11
764717
- cupy-cuda11x>=12.0.0
765-
- {matrix: {cuda: "11.5", arch: x86_64}, packages: *cupy_packages_cu11_x86_64}
766-
- {matrix: {cuda: "11.4", arch: x86_64}, packages: *cupy_packages_cu11_x86_64}
767-
- {matrix: {cuda: "11.2", arch: x86_64}, packages: *cupy_packages_cu11_x86_64}
768-
769-
# All CUDA 11 + aarch64 versions
770-
- matrix: {cuda: "11.8", arch: aarch64}
771-
packages: &cupy_packages_cu11_aarch64
772-
- cupy-cuda11x -f https://pip.cupy.dev/aarch64 # TODO: Verify that this works.
773-
- {matrix: {cuda: "11.5", arch: aarch64}, packages: *cupy_packages_cu11_aarch64}
774-
- {matrix: {cuda: "11.4", arch: aarch64}, packages: *cupy_packages_cu11_aarch64}
775-
- {matrix: {cuda: "11.2", arch: aarch64}, packages: *cupy_packages_cu11_aarch64}
776-
- {matrix: null, packages: [cupy-cuda11x>=12.0.0]}
718+
- {matrix: null, packages: *cupy_packages_cu11}

0 commit comments

Comments
 (0)