From 479b65a433d6a94a7e53e08ef56ec46fb10c07ef Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 23 Jul 2024 22:54:21 -0500 Subject: [PATCH 1/2] split up CUDA-suffixed dependencies in dependencies.yaml --- dependencies.yaml | 94 ++++++++++++++++++++++---- python/distributed-ucxx/pyproject.toml | 1 + python/pyproject.toml | 1 + 3 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index cd534335..721c15a9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -311,12 +311,26 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "true" packages: - rmm-cu12==24.8.*,>=0.0.0a0 - - matrix: {cuda: "11.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "false" + packages: + - *rmm_conda + - matrix: + cuda: "11.*" + cuda_suffixed: "true" packages: - rmm-cu11==24.8.*,>=0.0.0a0 + - matrix: + cuda: "11.*" + cuda_suffixed: "false" + packages: + - *rmm_conda - {matrix: null, packages: [*rmm_conda]} depends_on_cudf: common: @@ -331,12 +345,26 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "true" packages: - cudf-cu12==24.8.*,>=0.0.0a0 - - matrix: {cuda: "11.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "false" + packages: + - *cudf_conda + - matrix: + cuda: "11.*" + cuda_suffixed: "true" packages: - cudf-cu11==24.8.*,>=0.0.0a0 + - matrix: + cuda: "11.*" + cuda_suffixed: "false" + packages: + - *cudf_conda - {matrix: null, packages: [*cudf_conda]} depends_on_ucxx: common: @@ -351,12 +379,26 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "true" packages: - ucxx-cu12==0.39.*,>=0.0.0a0 - - matrix: {cuda: "11.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "false" + packages: + - *ucxx_conda + - matrix: + cuda: "11.*" + cuda_suffixed: "true" packages: - ucxx-cu11==0.39.*,>=0.0.0a0 + - matrix: + cuda: "11.*" + cuda_suffixed: "false" + packages: + - *ucxx_conda - {matrix: null, packages: [*ucxx_conda]} depends_on_ucx_build: common: @@ -371,15 +413,29 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "true" packages: - libucx-cu12==1.15.0 - - matrix: {cuda: "11.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "false" + packages: + - &libucx_build libucx==1.15.0 + - matrix: + cuda: "11.*" + cuda_suffixed: "true" packages: - libucx-cu11==1.15.0 + - matrix: + cuda: "11.*" + cuda_suffixed: "false" + packages: + - *libucx_build - matrix: null packages: - - libucx==1.15.0 + - *libucx_build depends_on_ucx_run: common: - output_types: conda @@ -393,12 +449,26 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "true" packages: - libucx-cu12>=1.15.0 - - matrix: {cuda: "11.*"} + - matrix: + cuda: "12.*" + cuda_suffixed: "false" + packages: + - &libucx_run libucx>=1.15.0 + - matrix: + cuda: "11.*" + cuda_suffixed: "true" packages: - libucx-cu11>=1.15.0 + - matrix: + cuda: "12.*" + cuda_suffixed: "false" + packages: + - *libucx_run - matrix: null packages: - - libucx>=1.15.0 + - *libucx_run diff --git a/python/distributed-ucxx/pyproject.toml b/python/distributed-ucxx/pyproject.toml index 653ecfc0..6d3f8cde 100644 --- a/python/distributed-ucxx/pyproject.toml +++ b/python/distributed-ucxx/pyproject.toml @@ -117,6 +117,7 @@ exclude = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" dependencies-file = "../../dependencies.yaml" +matrix-entry = "cuda_suffixed=true" [tool.setuptools.package-data] "distributed_ucxx" = ["VERSION"] diff --git a/python/pyproject.toml b/python/pyproject.toml index 1f26f564..c0f7999a 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -94,6 +94,7 @@ skip = [ [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", "cython>=3.0.0", From 787e2546cfe9dec5c5d87b1017cc1e0a32f5bf12 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jul 2024 13:43:40 -0500 Subject: [PATCH 2/2] consolidate cuda_suffixed=false blocks --- dependencies.yaml | 70 +++++++---------------------------------------- 1 file changed, 10 insertions(+), 60 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 721c15a9..5282675c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -302,7 +302,7 @@ dependencies: common: - output_types: conda packages: - - &rmm_conda rmm==24.8.*,>=0.0.0a0 + - &rmm_unsuffixed rmm==24.8.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -316,27 +316,17 @@ dependencies: cuda_suffixed: "true" packages: - rmm-cu12==24.8.*,>=0.0.0a0 - - matrix: - cuda: "12.*" - cuda_suffixed: "false" - packages: - - *rmm_conda - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - rmm-cu11==24.8.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "false" - packages: - - *rmm_conda - - {matrix: null, packages: [*rmm_conda]} + - {matrix: null, packages: [*rmm_unsuffixed]} depends_on_cudf: common: - output_types: conda packages: - - &cudf_conda cudf==24.8.*,>=0.0.0a0 + - &cudf_unsuffixed cudf==24.8.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -350,27 +340,17 @@ dependencies: cuda_suffixed: "true" packages: - cudf-cu12==24.8.*,>=0.0.0a0 - - matrix: - cuda: "12.*" - cuda_suffixed: "false" - packages: - - *cudf_conda - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - cudf-cu11==24.8.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "false" - packages: - - *cudf_conda - - {matrix: null, packages: [*cudf_conda]} + - {matrix: null, packages: [*cudf_unsuffixed]} depends_on_ucxx: common: - output_types: conda packages: - - &ucxx_conda ucxx==0.39.*,>=0.0.0a0 + - &ucxx_unsuffixed ucxx==0.39.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -384,27 +364,17 @@ dependencies: cuda_suffixed: "true" packages: - ucxx-cu12==0.39.*,>=0.0.0a0 - - matrix: - cuda: "12.*" - cuda_suffixed: "false" - packages: - - *ucxx_conda - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - ucxx-cu11==0.39.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "false" - packages: - - *ucxx_conda - - {matrix: null, packages: [*ucxx_conda]} + - {matrix: null, packages: [*ucxx_unsuffixed]} depends_on_ucx_build: common: - output_types: conda packages: - - &ucx_conda_build ucx==1.15.0 + - ucx==1.15.0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -418,29 +388,19 @@ dependencies: cuda_suffixed: "true" packages: - libucx-cu12==1.15.0 - - matrix: - cuda: "12.*" - cuda_suffixed: "false" - packages: - - &libucx_build libucx==1.15.0 - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - libucx-cu11==1.15.0 - - matrix: - cuda: "11.*" - cuda_suffixed: "false" - packages: - - *libucx_build - matrix: null packages: - - *libucx_build + - libucx==1.15.0 depends_on_ucx_run: common: - output_types: conda packages: - - &ucx_conda_run ucx>=1.15.0 + - ucx>=1.15.0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -454,21 +414,11 @@ dependencies: cuda_suffixed: "true" packages: - libucx-cu12>=1.15.0 - - matrix: - cuda: "12.*" - cuda_suffixed: "false" - packages: - - &libucx_run libucx>=1.15.0 - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - libucx-cu11>=1.15.0 - - matrix: - cuda: "12.*" - cuda_suffixed: "false" - packages: - - *libucx_run - matrix: null packages: - - *libucx_run + - libucx>=1.15.0