From ee39afa268bad1471c08ab3947aee533ce310793 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jul 2024 14:09:18 -0500 Subject: [PATCH] consolidate cuda_suffixed=false blocks in dependencies.yaml --- dependencies.yaml | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index f547df6b..c3b62965 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -168,11 +168,11 @@ dependencies: - pytest-cov - output_types: [conda] packages: - - &cudf_conda cudf==24.8.*,>=0.0.0a0 - - &dask_cudf_conda dask-cudf==24.8.*,>=0.0.0a0 + - &cudf_unsuffixed cudf==24.8.*,>=0.0.0a0 + - &dask_cudf_unsuffixed dask-cudf==24.8.*,>=0.0.0a0 - distributed-ucxx==0.39.*,>=0.0.0a0 - - &kvikio_conda kvikio==24.8.*,>=0.0.0a0 - - &ucx_py_conda ucx-py==0.39.*,>=0.0.0a0 + - &kvikio_unsuffixed kvikio==24.8.*,>=0.0.0a0 + - &ucx_py_unsuffixed ucx-py==0.39.*,>=0.0.0a0 - ucx-proc=*=gpu - ucxx==0.39.*,>=0.0.0a0 specific: @@ -197,13 +197,6 @@ dependencies: - cudf-cu12==24.8.*,>=0.0.0a0 - dask-cudf-cu12==24.8.*,>=0.0.0a0 - ucx-py-cu12==0.39.*,>=0.0.0a0 - - matrix: - cuda: "12.*" - cuda_suffixed: "false" - packages: - - *cudf_conda - - *dask_cudf_conda - - *ucx_py_conda - matrix: cuda: "11.*" cuda_suffixed: "true" @@ -211,16 +204,9 @@ dependencies: - cudf-cu11==24.8.*,>=0.0.0a0 - dask-cudf-cu11==24.8.*,>=0.0.0a0 - ucx-py-cu11==0.39.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "false" - packages: - - *cudf_conda - - *dask_cudf_conda - - *ucx_py_conda - matrix: packages: - - *cudf_conda - - *dask_cudf_conda - - *kvikio_conda - - *ucx_py_conda + - *cudf_unsuffixed + - *dask_cudf_unsuffixed + - *kvikio_unsuffixed + - *ucx_py_unsuffixed