From 159f295fdbc197e94af88e0852474688b94b8b85 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 10 Jan 2024 15:41:20 -0600
Subject: [PATCH] refactor CUDA versions in dependencies.yaml

---
 .pre-commit-config.yaml |  2 +-
 dependencies.yaml       | 36 ++++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 985843b5..fa889125 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ repos:
                 args: ["--config=.flake8"]
                 files: python/.*$
       - repo: https://github.com/rapidsai/dependency-file-generator
-        rev: v1.7.1
+        rev: v1.8.0
         hooks:
             - id: rapids-dependency-file-generator
               args: ["--clean"]
diff --git a/dependencies.yaml b/dependencies.yaml
index 0ff1a431..22ecac54 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -7,7 +7,8 @@ files:
       arch: [x86_64]
     includes:
       - build_wheels
-      - cudatoolkit
+      - cuda
+      - cuda_version
       - checks
       - docs
       - notebook
@@ -17,13 +18,13 @@ files:
   test_python:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - py_version
       - test_python
   test_notebooks:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - notebook
       - py_version
   checks:
@@ -34,7 +35,7 @@ files:
   docs:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - docs
       - py_version
   py_build:
@@ -71,34 +72,37 @@ dependencies:
         packages:
           - wheel
           - setuptools
-  cudatoolkit:
+  cuda_version:
     specific:
       - output_types: conda
         matrices:
           - matrix:
-              cuda: "12.0"
+              cuda: "11.2"
             packages:
-              - cuda-version=12.0
+              - cuda-version=11.2
+          - matrix:
+              cuda: "11.4"
+            packages:
+              - cuda-version=11.4
           - matrix:
               cuda: "11.8"
             packages:
               - cuda-version=11.8
-              - cudatoolkit
           - matrix:
-              cuda: "11.5"
+              cuda: "12.0"
             packages:
-              - cuda-version=11.5
-              - cudatoolkit
+              - cuda-version=12.0
+  cuda:
+    specific:
+      - output_types: conda
+        matrices:
           - matrix:
-              cuda: "11.4"
+              cuda: "11.*"
             packages:
-              - cuda-version=11.4
               - cudatoolkit
           - matrix:
-              cuda: "11.2"
+              cuda: "12.*"
             packages:
-              - cuda-version=11.2
-              - cudatoolkit
   checks:
     common:
       - output_types: [conda, requirements]