Skip to content

Commit f91a680

Browse files
jameslambrongou
authored andcommitted
resolve dependency-file-generator warning, remove unnecessary rapids-build-backend configuration (#1582)
Contributes to rapidsai/build-planning#31 Contributes to rapidsai/dependency-file-generator#89 #1502 was one of the first `rapids-build-backend` PRs merged across RAPIDS. Since it was merged, we've made some small adjustments to the approach for `rapids-build-backend`. This catches `rmm` up with those changes: * consolidates version-handling in `ci/build_cpp.sh` * removes `commit-file` configuration in `pyproject.toml` - *as of rapidsai/rapids-build-backend#30, this is no longer necessary if the project's top-level directory is `{project_name}.replace("-", "_")* - *and anyway, it was changed from `commit-file` to `commit-files` in that PR, so `commit-file` was being silently ignored here* * uses `--file-key` instead of `--file_key` in `rapids-dependency-file-generator` calls Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) URL: #1582
1 parent 77b434e commit f91a680

7 files changed

+7
-11
lines changed

ci/build_cpp.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2020-2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2020-2024, NVIDIA CORPORATION.
33

44
set -euo pipefail
55

@@ -13,11 +13,9 @@ export CMAKE_GENERATOR=Ninja
1313

1414
rapids-print-env
1515

16-
version=$(rapids-generate-version)
17-
1816
rapids-logger "Begin cpp build"
1917

2018
# This calls mambabuild when boa is installed (as is the case in the CI images)
21-
RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/librmm
19+
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/librmm
2220

2321
rapids-upload-conda-to-s3 cpp

ci/build_docs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ rapids-logger "Create test conda environment"
88

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

1414
rapids-mamba-retry env create --yes -f env.yaml -n docs

ci/check_style.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2020-2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2020-2024, NVIDIA CORPORATION.
33

44
set -euo pipefail
55

@@ -8,7 +8,7 @@ rapids-logger "Create checks conda environment"
88

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

1414
rapids-mamba-retry env create --yes -f env.yaml -n checks

ci/test_cpp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
1111
rapids-logger "Generate C++ testing dependencies"
1212
rapids-dependency-file-generator \
1313
--output conda \
14-
--file_key test_cpp \
14+
--file-key test_cpp \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml
1616

1717
rapids-mamba-retry env create --yes -f env.yaml -n test

ci/test_python.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rapids-logger "Create test conda environment"
1111

1212
rapids-dependency-file-generator \
1313
--output conda \
14-
--file_key test_python \
14+
--file-key test_python \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
1616

1717
rapids-mamba-retry env create --yes -f env.yaml -n test

python/librmm/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ librmm = "librmm"
4545

4646
[tool.rapids-build-backend]
4747
build-backend = "scikit_build_core.build"
48-
commit-file = "librmm/GIT_COMMIT"
4948
dependencies-file = "../../dependencies.yaml"
5049
requires = [
5150
"cmake>=3.26.4",

python/rmm/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ regex = "(?P<value>.*)"
123123

124124
[tool.rapids-build-backend]
125125
build-backend = "scikit_build_core.build"
126-
commit-file = "rmm/GIT_COMMIT"
127126
dependencies-file = "../../dependencies.yaml"
128127
requires = [
129128
"cmake>=3.26.4",

0 commit comments

Comments
 (0)