From 73414b6b306e0344760e5e69ab00cf69fa7f05d3 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 10 Jan 2024 08:33:56 -0800
Subject: [PATCH 1/4] refactor CUDA versions in dependencies.yaml

---
 dependencies.yaml | 67 ++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 94f31240797..71bd28d69e9 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -11,7 +11,8 @@ files:
       - build_wheels
       - build_python_common
       - build_python_cudf
-      - cudatoolkit
+      - cuda
+      - cuda_version
       - develop
       - docs
       - libarrow_build
@@ -29,13 +30,13 @@ files:
   test_cpp:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - test_cpp
       - libarrow_run
   test_python:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - py_version
       - test_python_common
       - test_python_cudf
@@ -46,14 +47,14 @@ files:
     includes:
       - build_all
       - libarrow_run
-      - cudatoolkit
+      - cuda_version
       - test_java
   test_notebooks:
     output: none
     includes:
       - notebooks
       - py_version
-      - notebook_cuda_version
+      - cuda_version
   checks:
     output: none
     includes:
@@ -62,7 +63,8 @@ files:
   docs:
     output: none
     includes:
-      - cudatoolkit
+      - cuda
+      - cuda_version
       - docs
       - libarrow_run
       - py_version
@@ -333,37 +335,51 @@ dependencies:
           # Allow runtime version to float up to minor version
           # Disallow pyarrow 14.0.0 due to a CVE
           - pyarrow>=14.0.1,<15.0.0a0
-  cudatoolkit:
+  cuda_version:
     specific:
       - output_types: conda
         matrices:
           - matrix:
-              cuda: "12.*"
+              cuda: "11.2"
             packages:
-              - cuda-cudart-dev
-              - cuda-nvrtc-dev
-              - cuda-nvtx-dev
-              - libcurand-dev
-          - matrix:  # Fallback for CUDA 11 or no matrix
+              - cuda-version=11.2
+          - matrix:
+              cuda: "11.4"
             packages:
-              - cudatoolkit
-      - output_types: conda
-        matrices:
+              - cuda-version=11.4
+          - matrix:
+              cuda: "11.5"
+            packages:
+              - cuda-version=11.5
+          - matrix:
+              cuda: "11.8"
+            packages:
+              - cuda-version=11.8
           - matrix:
               cuda: "12.0"
             packages:
               - cuda-version=12.0
+  cuda:
+    specific:
+      - output_types: conda
+        matrices:
+          - matrix:
+              cuda: "12.*"
+            packages:
+              - cuda-cudart-dev
+              - cuda-nvrtc-dev
+              - cuda-nvtx-dev
+              - libcurand-dev
           - matrix:
               cuda: "11.8"
             packages:
-              - cuda-version=11.8
+              - cudatoolkit
               - cuda-nvtx=11.8
               - libcurand-dev=10.3.0.86
               - libcurand=10.3.0.86
           - matrix:
               cuda: "11.5"
             packages:
-              - cuda-version=11.5
               - cudatoolkit
               - cuda-nvtx=11.5
                 # Can't hard pin the version since 11.x is missing many
@@ -373,7 +389,6 @@ dependencies:
           - matrix:
               cuda: "11.4"
             packages:
-              - cuda-version=11.4
               - cudatoolkit
               - &cudanvtx114 cuda-nvtx=11.4
               - &libcurand_dev114 libcurand-dev>=10.2.5.43,<=10.2.5.120
@@ -381,7 +396,6 @@ dependencies:
           - matrix:
               cuda: "11.2"
             packages:
-              - cuda-version=11.2
               - cudatoolkit
                 # The NVIDIA channel doesn't publish pkgs older than 11.4 for
                 # these libs, so 11.2 uses 11.4 packages (the oldest
@@ -389,6 +403,9 @@ dependencies:
               - *cudanvtx114
               - *libcurand_dev114
               - *libcurand114
+          - matrix:  # Fallback for CUDA 11 or no matrix
+            packages:
+              - cudatoolkit
       - output_types: conda
         matrices:
           - matrix:
@@ -753,13 +770,3 @@ dependencies:
         packages:
           - ipython
           - openpyxl
-  notebook_cuda_version:
-    specific:
-       - output_types: conda
-         matrices:
-           - matrix: {cuda: "12.0"}
-             packages:
-               - cuda-version=12.0
-           - matrix: {cuda: "11.8"}
-             packages:
-               - cuda-version=11.8

From 1b306cf81e83bc27ac5ba4d534056a272e64d40f Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 10 Jan 2024 09:45:03 -0800
Subject: [PATCH 2/4] remove fallback, alphabetize lists

---
 dependencies.yaml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 71bd28d69e9..ee9f1464679 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -31,30 +31,30 @@ files:
     output: none
     includes:
       - cuda_version
-      - test_cpp
       - libarrow_run
+      - test_cpp
   test_python:
     output: none
     includes:
       - cuda_version
       - py_version
+      - pyarrow_run
       - test_python_common
       - test_python_cudf
       - test_python_dask_cudf
-      - pyarrow_run
   test_java:
     output: none
     includes:
       - build_all
-      - libarrow_run
       - cuda_version
+      - libarrow_run
       - test_java
   test_notebooks:
     output: none
     includes:
+      - cuda_version
       - notebooks
       - py_version
-      - cuda_version
   checks:
     output: none
     includes:
@@ -403,9 +403,6 @@ dependencies:
               - *cudanvtx114
               - *libcurand_dev114
               - *libcurand114
-          - matrix:  # Fallback for CUDA 11 or no matrix
-            packages:
-              - cudatoolkit
       - output_types: conda
         matrices:
           - matrix:

From 10bf3ba17c6c27723c412902c7f3384988a54bc1 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 10 Jan 2024 17:34:39 -0600
Subject: [PATCH 3/4] add cuda runtime back to java env

---
 dependencies.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dependencies.yaml b/dependencies.yaml
index ee9f1464679..28b3afd7bbc 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -46,6 +46,7 @@ files:
     output: none
     includes:
       - build_all
+      - cuda
       - cuda_version
       - libarrow_run
       - test_java

From 1b2166385abef0add465bf6744e97247aaad7293 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Thu, 11 Jan 2024 09:51:49 -0600
Subject: [PATCH 4/4] empty commit to re-trigger CI