Skip to content

Commit

Permalink
consolidate cuda_unsuffixed=false blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@jameslamb
jameslamb committed Jul 24, 2024
1 parent eb9f3bb commit 882d126
Showing 1 changed file with 14 additions and 66 deletions.
80 changes: 14 additions & 66 deletions dependencies.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,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
Expand Down Expand Up @@ -237,22 +237,12 @@ dependencies:
cuda_suffixed: "true"
packages:
- &rmm_cu12 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 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] }
checks:
common:
- output_types: [conda, requirements]
Expand All @@ -274,7 +264,7 @@ dependencies:
- h5py>=3.8.0
- benchmark>=1.8.2
- openblas
- *rmm_conda
- *rmm_unsuffixed
nn_bench_python:
common:
- output_types: [conda]
Expand Down Expand Up @@ -455,7 +445,7 @@ dependencies:
- &numpy numpy>=1.23,<2.0a0
- output_types: [conda]
packages:
- *rmm_conda
- *rmm_unsuffixed
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand Down Expand Up @@ -484,7 +474,7 @@ dependencies:
- matrix: {cuda: "11.*"}
packages:
- *rmm_cu11
- {matrix: null, packages: [*rmm_conda]}
- {matrix: null, packages: [*rmm_unsuffixed]}
run_raft_dask:
common:
- output_types: [conda, pyproject]
Expand All @@ -496,8 +486,8 @@ dependencies:
- rapids-dask-dependency==24.8.*,>=0.0.0a0
- output_types: conda
packages:
- &pylibraft_conda pylibraft==24.8.*,>=0.0.0a0
- &ucx_py_conda ucx-py==0.39.*,>=0.0.0a0
- &pylibraft_unsuffixed pylibraft==24.8.*,>=0.0.0a0
- &ucx_py_unsuffixed ucx-py==0.39.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand All @@ -513,25 +503,13 @@ dependencies:
packages:
- &pylibraft_cu12 pylibraft-cu12==24.8.*,>=0.0.0a0
- &ucx_py_cu12 ucx-py-cu12==0.39.*,>=0.0.0a0
- matrix:
cuda: "12.*"
cuda_suffixed: "false"
packages:
- *pylibraft_conda
- *ucx_py_conda
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- &pylibraft_cu11 pylibraft-cu11==24.8.*,>=0.0.0a0
- &ucx_py_cu11 ucx-py-cu11==0.39.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "false"
packages:
- *pylibraft_conda
- *ucx_py_conda
- {matrix: null, packages: [*pylibraft_conda, *ucx_py_conda]}
- {matrix: null, packages: [*pylibraft_unsuffixed, *ucx_py_unsuffixed]}
test_python_common:
common:
- output_types: [conda, requirements, pyproject]
Expand All @@ -550,7 +528,7 @@ dependencies:
packages:
# UCXX is not currently a hard-dependency thus only installed during tests,
# this will change in the future.
- &distributed_ucxx_conda distributed-ucxx==0.39.*,>=0.0.0a0
- &distributed_ucxx_unsuffixed distributed-ucxx==0.39.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand All @@ -564,27 +542,17 @@ dependencies:
cuda_suffixed: "true"
packages:
- distributed-ucxx-cu12==0.39.*,>=0.0.0a0
- matrix:
cuda: "12.*"
cuda_suffixed: "false"
packages:
- *distributed_ucxx_conda
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- distributed-ucxx-cu11==0.39.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "false"
packages:
- *distributed_ucxx_conda
- {matrix: null, packages: [*distributed_ucxx_conda]}
- {matrix: null, packages: [*distributed_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
Expand All @@ -598,29 +566,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
Expand All @@ -634,21 +592,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: "11.*"
cuda_suffixed: "false"
packages:
- *libucx_run
- matrix: null
packages:
- *libucx_run
- libucx>=1.15.0

0 comments on commit 882d126

Please sign in to comment.