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

resolve dependency-file-generator warning, other rapids-build-backend followup #2360

Merged
merged 2 commits into from
Jun 14, 2024
Merged

resolve dependency-file-generator warning, other rapids-build-backend followup #2360

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
687add6
resolve dependency-file-generator warning, other rapids-build-backend…
jameslamb Jun 12, 2024
01eed43
Merge branch 'branch-24.08' into more-rbb
jameslamb Jun 13, 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
4 changes: 1 addition & 3 deletions ci/build_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ export CMAKE_GENERATOR=Ninja

rapids-print-env

version=$(rapids-generate-version)

rapids-logger "Begin cpp build"

RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libraft
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libraft

rapids-upload-conda-to-s3 cpp
2 changes: 1 addition & 1 deletion ci/build_docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ rapids-logger "Create test conda environment"

rapids-dependency-file-generator \
--output conda \
--file_key docs \
--file-key docs \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml

rapids-mamba-retry env create --yes -f env.yaml -n docs
Expand Down
2 changes: 1 addition & 1 deletion ci/check_style.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ rapids-logger "Create checks conda environment"

rapids-dependency-file-generator \
--output conda \
--file_key checks \
--file-key checks \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml

rapids-mamba-retry env create --yes -f env.yaml -n checks
Expand Down
2 changes: 1 addition & 1 deletion ci/test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
rapids-logger "Generate C++ testing dependencies"
rapids-dependency-file-generator \
--output conda \
--file_key test_cpp \
--file-key test_cpp \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml

rapids-mamba-retry env create --yes -f env.yaml -n test
Expand Down
2 changes: 1 addition & 1 deletion ci/test_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
rapids-logger "Generate Python testing dependencies"
rapids-dependency-file-generator \
--output conda \
--file_key test_python \
--file-key test_python \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml

rapids-mamba-retry env create --yes -f env.yaml -n test
Expand Down
20 changes: 10 additions & 10 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ files:
cuda: ["11.8", "12.2"]
arch: [x86_64, aarch64]
includes:
- build
- rapids_build
- build_pylibraft
- cuda
Expand All @@ -15,9 +14,10 @@ files:
- depends_on_distributed_ucxx
- develop
- checks
- build_wheels
- test_libraft
- docs
- rapids_build_setuptools
- rapids_build_skbuild
- run_raft_dask
- run_pylibraft
- test_python_common
Expand All @@ -28,13 +28,13 @@ files:
cuda: ["11.8", "12.0"]
arch: [x86_64, aarch64]
includes:
- build
- rapids_build
- cuda
- cuda_version
- develop
- nn_bench
- nn_bench_python
- rapids_build_skbuild
test_cpp:
output: none
includes:
Expand Down Expand Up @@ -67,7 +67,7 @@ files:
extras:
table: build-system
includes:
- build
- rapids_build_skbuild
py_rapids_build_pylibraft:
output: pyproject
pyproject_dir: python/pylibraft
Expand Down Expand Up @@ -100,7 +100,7 @@ files:
extras:
table: build-system
includes:
- build
- rapids_build_skbuild
py_rapids_build_raft_dask:
output: pyproject
pyproject_dir: python/raft-dask
Expand Down Expand Up @@ -132,7 +132,7 @@ files:
extras:
table: build-system
includes:
- build_wheels
- rapids_build_setuptools
py_run_raft_ann_bench:
output: pyproject
pyproject_dir: python/raft-ann-bench
Expand All @@ -147,11 +147,11 @@ channels:
- conda-forge
- nvidia
dependencies:
build:
rapids_build_skbuild:
common:
- output_types: [conda, requirements, pyproject]
packages:
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- &rapids_build_backend rapids-build-backend>=0.3.0,<0.4.0.dev0
- output_types: [conda]
packages:
- scikit-build-core>=0.7.0
Expand Down Expand Up @@ -404,13 +404,13 @@ dependencies:
- recommonmark
- sphinx-copybutton
- sphinx-markdown-tables
build_wheels:
rapids_build_setuptools:
common:
- output_types: [requirements, pyproject]
packages:
- wheel
- setuptools
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- *rapids_build_backend
py_version:
specific:
- output_types: conda
Expand Down
Loading