From e8df17d5f383ada7e493dda54c31a494a87fb7d3 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jul 2024 17:24:45 -0500 Subject: [PATCH] split up CUDA-suffixed dependencies in dependencies.yaml (#1627) Contributes to https://github.com/rapidsai/build-planning/issues/31 In short, RAPIDS DLFW builds want to produce wheels with unsuffixed dependencies, e.g. `cudf` depending on `rmm`, not `rmm-cu12`. This PR is part of a series across all of RAPIDS to try to support that type of build by setting up CUDA-suffixed and CUDA-unsuffixed dependency lists in `dependencies.yaml`. For more details, see: * https://github.com/rapidsai/build-planning/issues/31#issuecomment-2245815818 * https://github.com/rapidsai/cudf/pull/16183 ## Notes for Reviewers ### Why target 24.08? This is targeting 24.08 because: 1. it should be very low-risk 2. getting these changes into 24.08 prevents the need to carry around patches for every library in DLFW builds using RAPIDS 24.08 Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Vyas Ramasubramani (https://github.com/vyasr) URL: https://github.com/rapidsai/rmm/pull/1627 --- dependencies.yaml | 4 +++- python/librmm/pyproject.toml | 1 + python/rmm/pyproject.toml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 82847c89c..974192967 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -161,13 +161,15 @@ dependencies: matrices: - matrix: cuda: "12.*" + cuda_suffixed: "true" packages: - librmm-cu12==24.8.*,>=0.0.0a0 - matrix: cuda: "11.*" + cuda_suffixed: "true" packages: - librmm-cu11==24.8.*,>=0.0.0a0 - - matrix: + - matrix: null packages: - librmm==24.8.*,>=0.0.0a0 checks: 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",