From 1325cb74d6aed47132922b60b7d1497934a75a87 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 23 Jul 2024 16:50:24 -0500 Subject: [PATCH 1/3] split up CUDA-suffixed dependencies in dependencies.yaml --- dependencies.yaml | 14 ++++++++++++-- python/librmm/pyproject.toml | 1 + python/rmm/pyproject.toml | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 82847c89c..62647d8ef 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -161,15 +161,25 @@ dependencies: matrices: - matrix: cuda: "12.*" + cuda_suffixed: "true" packages: - librmm-cu12==24.8.*,>=0.0.0a0 + - matrix: + cuda: "12.*" + cuda_suffixed: "false" + packages: + - &librmm_unsuffixed librmm==24.8.*,>=0.0.0a0 - matrix: cuda: "11.*" + cuda_suffixed: "true" packages: - librmm-cu11==24.8.*,>=0.0.0a0 - matrix: - packages: - - librmm==24.8.*,>=0.0.0a0 + cuda: "11.*" + cuda_suffixed: "false" + packages: &cython_build_cu11_unsuffixed + - *librmm_unsuffixed + - {matrix: null, packages: *cython_build_cu11_unsuffixed} checks: common: - output_types: [conda, requirements] diff --git a/python/librmm/pyproject.toml b/python/librmm/pyproject.toml index 1b4042217..6bfae3000 100644 --- a/python/librmm/pyproject.toml +++ b/python/librmm/pyproject.toml @@ -46,6 +46,7 @@ librmm = "librmm" [tool.rapids-build-backend] build-backend = "scikit_build_core.build" dependencies-file = "../../dependencies.yaml" +matrix-entry = "cuda_suffixed=true" requires = [ "cmake>=3.26.4,!=3.30.0", "ninja", diff --git a/python/rmm/pyproject.toml b/python/rmm/pyproject.toml index 9cbabda61..acc3b6c85 100644 --- a/python/rmm/pyproject.toml +++ b/python/rmm/pyproject.toml @@ -124,6 +124,7 @@ regex = "(?P.*)" [tool.rapids-build-backend] build-backend = "scikit_build_core.build" dependencies-file = "../../dependencies.yaml" +matrix-entry = "cuda_suffixed=true" requires = [ "cmake>=3.26.4,!=3.30.0", "cuda-python>=11.7.1,<12.0a0", From a401ee0af225a7b0c9839e7684ee2b7873d499cc Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jul 2024 13:28:48 -0500 Subject: [PATCH 2/3] consolidate cuda_suffixed=false blocks --- dependencies.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 62647d8ef..af4ab70f1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -164,22 +164,12 @@ dependencies: cuda_suffixed: "true" packages: - librmm-cu12==24.8.*,>=0.0.0a0 - - matrix: - cuda: "12.*" - cuda_suffixed: "false" - packages: - - &librmm_unsuffixed librmm==24.8.*,>=0.0.0a0 - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - librmm-cu11==24.8.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "false" - packages: &cython_build_cu11_unsuffixed - - *librmm_unsuffixed - - {matrix: null, packages: *cython_build_cu11_unsuffixed} + - {matrix: null, packages: ['librmm==24.8.*,>=0.0.0a0']} checks: common: - output_types: [conda, requirements] From 674fd7b759bf52182919ad87ad9bff33c3ba829e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jul 2024 13:32:10 -0500 Subject: [PATCH 3/3] reformat fallback matrix --- dependencies.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index af4ab70f1..974192967 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -169,7 +169,9 @@ dependencies: cuda_suffixed: "true" packages: - librmm-cu11==24.8.*,>=0.0.0a0 - - {matrix: null, packages: ['librmm==24.8.*,>=0.0.0a0']} + - matrix: null + packages: + - librmm==24.8.*,>=0.0.0a0 checks: common: - output_types: [conda, requirements]