Merge branch 'branch-23.08' into feat/cuda12_nvidia_build

rapidsai · Jul 11, 2023 · ab9c9d8 · ab9c9d8
2 parents 3a8532c + 090ce41
commit ab9c9d8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -24,7 +24,9 @@ dependencies:
 - distributed>=2023.5.1
 - doxygen=1.8.20
 - gcc_linux-64=11.*
+- gmock>=1.13.0
 - graphviz
+- gtest>=1.13.0
 - hdbscan
 - hypothesis>=6.0,<7
 - ipykernel
@@ -49,6 +51,7 @@ dependencies:
 - nltk
 - numba>=0.57
 - numpydoc
+- nvcc_linux-64=11.8
 - pip
 - pydata-sphinx-theme
 - pylibraft==23.8.*

diff --git a/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml b/conda/environments/cpp_all_cuda-118_arch-x86_64.yaml
@@ -13,6 +13,8 @@ dependencies:
 - cudatoolkit
 - cxx-compiler
 - gcc_linux-64=11.*
+- gmock>=1.13.0
+- gtest>=1.13.0
 - libcublas-dev=11.11.3.6
 - libcublas=11.11.3.6
 - libcufft-dev=10.9.0.58
@@ -28,5 +30,6 @@ dependencies:
 - libraft==23.8.*
 - librmm==23.8.*
 - ninja
+- nvcc_linux-64=11.8
 - sysroot_linux-64==2.17
 name: cpp_all_cuda-118_arch-x86_64
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -91,6 +91,8 @@ dependencies:
         packages:
           - c-compiler
           - cxx-compiler
+          - gmock>=1.13.0
+          - gtest>=1.13.0
           - libcumlprims==23.8.*
           - libraft==23.8.*
           - libraft-headers==23.8.*
@@ -108,6 +110,18 @@ dependencies:
             packages:
               - gcc_linux-aarch64=11.*
               - sysroot_linux-aarch64==2.17
+      - output_types: conda
+        matrices:
+          - matrix:
+              arch: x86_64
+              cuda: "11.8"
+            packages:
+              - nvcc_linux-64=11.8
+          - matrix:
+              arch: aarch64
+              cuda: "11.8"
+            packages:
+              - nvcc_linux-aarch64=11.8
   py_build:
     common:
       - output_types: [conda, requirements, pyproject]