Skip to content

Commit e5888f8

Browse files
authored
allow deselecting nvcomp wheels (#589)
Follow-up to #478 Adds a matrix filter `use_cuda_wheels` in the `dependencies.yaml` list used for `libkvikio`'s `nvcomp` dependency. Some types of builds (like RAPIDS devcontainers) prefer to use the system-installed nvCOMP to one provided by wheels. This ensures that preference is respected, because those builds pass matrix selector `use_cuda_wheels=false` through `rapids-dependency-file-generator` (rapidsai/devcontainers#382). ## Notes for Reviewers Similar changes in cuDF: rapidsai/cudf#17774 Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) URL: #589
1 parent 34f3f3e commit e5888f8

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ repos:
104104
)
105105
- id: verify-alpha-spec
106106
- repo: https://github.com/rapidsai/dependency-file-generator
107-
rev: v1.16.0
107+
rev: v1.17.0
108108
hooks:
109109
- id: rapids-dependency-file-generator
110110
args: ["--clean"]

dependencies.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,21 @@ dependencies:
299299
matrices:
300300
- matrix:
301301
cuda: "12.*"
302+
use_cuda_wheels: "true"
302303
packages:
303304
- nvidia-nvcomp-cu12==4.1.0.6
304305
- matrix:
305306
cuda: "11.*"
307+
use_cuda_wheels: "true"
306308
packages:
307309
- nvidia-nvcomp-cu11==4.1.0.6
310+
# if use_cuda_wheels=false is provided, do not add dependencies on any CUDA wheels
311+
# (e.g. for DLFW and pip devcontainers)
312+
- matrix:
313+
use_cuda_wheels: "false"
314+
packages:
315+
# if no matching matrix selectors passed, list the unsuffixed packages
316+
# (just as a source of documentation, as this populates pyproject.toml in source control)
308317
- matrix:
309318
packages:
310319
- nvidia-nvcomp==4.1.0.6

python/kvikio/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ nvcomp_batch = "kvikio.nvcomp_codec:NvCompBatchCodec"
115115
[tool.rapids-build-backend]
116116
build-backend = "scikit_build_core.build"
117117
dependencies-file = "../../dependencies.yaml"
118-
matrix-entry = "cuda_suffixed=true"
118+
matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true"
119119
requires = [
120120
"cmake>=3.26.4,!=3.30.0",
121121
"cython>=3.0.0",

0 commit comments

Comments
 (0)