From 671637dd8cc78be23af71376f9e66c649dc117e8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 21 Jan 2025 16:02:32 -0600 Subject: [PATCH 1/4] allow deselecting nvcomp wheels --- .pre-commit-config.yaml | 2 +- dependencies.yaml | 11 ++++++++++- python/libkvikio/pyproject.toml | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b019127335..50f26c7bc0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -104,7 +104,7 @@ repos: ) - id: verify-alpha-spec - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.16.0 + rev: v1.17.0 hooks: - id: rapids-dependency-file-generator args: ["--clean"] diff --git a/dependencies.yaml b/dependencies.yaml index f23f78f3d6..6037d812a9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -295,16 +295,25 @@ dependencies: packages: - nvcomp==4.1.0.6 specific: - - output_types: [requirements, pyproject] + - output_types: [pyproject, requirements] matrices: - matrix: cuda: "12.*" + use_cuda_wheels: "true" packages: - nvidia-nvcomp-cu12==4.1.0.6 - matrix: cuda: "11.*" + use_cuda_wheels: "true" packages: - nvidia-nvcomp-cu11==4.1.0.6 + # if use_cuda_wheels=false is provided, do not add dependencies on any CUDA wheels + # (e.g. for DLFW and pip devcontainers) + - matrix: + use_cuda_wheels: "false" + packages: + # if no matching matrix selectors passed, list the unsuffixed packages + # (just as a source of documentation, as this populates pyproject.toml in source control) - matrix: packages: - nvidia-nvcomp==4.1.0.6 diff --git a/python/libkvikio/pyproject.toml b/python/libkvikio/pyproject.toml index 9504cb3755..58387bacff 100644 --- a/python/libkvikio/pyproject.toml +++ b/python/libkvikio/pyproject.toml @@ -51,7 +51,7 @@ regex = "(?P.*)" [tool.rapids-build-backend] build-backend = "scikit_build_core.build" dependencies-file = "../../dependencies.yaml" -matrix-entry = "cuda_suffixed=true" +matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true" requires = [ "cmake>=3.26.4,!=3.30.0", "ninja", From d6b3e22be2b0ea528380bdf72139eabc3eec275b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 21 Jan 2025 16:21:31 -0600 Subject: [PATCH 2/4] Update dependencies.yaml --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 6037d812a9..73da19c51c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -295,7 +295,7 @@ dependencies: packages: - nvcomp==4.1.0.6 specific: - - output_types: [pyproject, requirements] + - output_types: pyproject matrices: - matrix: cuda: "12.*" From 77548b71f8b40a234a6ce4941524f49b70a13d64 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 21 Jan 2025 17:14:12 -0600 Subject: [PATCH 3/4] the nvcomp dependency is in kvikio, not libkvikio --- python/kvikio/pyproject.toml | 2 +- python/libkvikio/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml index 9ce0467ede..a1840f2d03 100644 --- a/python/kvikio/pyproject.toml +++ b/python/kvikio/pyproject.toml @@ -115,7 +115,7 @@ nvcomp_batch = "kvikio.nvcomp_codec:NvCompBatchCodec" [tool.rapids-build-backend] build-backend = "scikit_build_core.build" dependencies-file = "../../dependencies.yaml" -matrix-entry = "cuda_suffixed=true" +matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true" requires = [ "cmake>=3.26.4,!=3.30.0", "cython>=3.0.0", diff --git a/python/libkvikio/pyproject.toml b/python/libkvikio/pyproject.toml index 58387bacff..9504cb3755 100644 --- a/python/libkvikio/pyproject.toml +++ b/python/libkvikio/pyproject.toml @@ -51,7 +51,7 @@ regex = "(?P.*)" [tool.rapids-build-backend] build-backend = "scikit_build_core.build" dependencies-file = "../../dependencies.yaml" -matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true" +matrix-entry = "cuda_suffixed=true" requires = [ "cmake>=3.26.4,!=3.30.0", "ninja", From b134b499a56071ae717ccff1cefaa6fdd1551777 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 21 Jan 2025 19:09:06 -0600 Subject: [PATCH 4/4] Update dependencies.yaml --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 73da19c51c..41f9adc26f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -295,7 +295,7 @@ dependencies: packages: - nvcomp==4.1.0.6 specific: - - output_types: pyproject + - output_types: [requirements, pyproject] matrices: - matrix: cuda: "12.*"