Manual changes.

rapidsai · Jan 13, 2025 · 03a83c5 · 03a83c5
1 parent 97f4349
commit 03a83c5
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -37,6 +37,6 @@ dependencies:
 - sphinx
 - sphinx-click
 - sphinx_rtd_theme
-- sysroot_linux-aarch64=2.17
+- sysroot_linux-aarch64=2.28
 - zarr>=2.0.0,<3.0.0a0
 name: all_cuda-118_arch-aarch64
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -39,6 +39,6 @@ dependencies:
 - sphinx
 - sphinx-click
 - sphinx_rtd_theme
-- sysroot_linux-64=2.17
+- sysroot_linux-64=2.28
 - zarr>=2.0.0,<3.0.0a0
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml
@@ -16,7 +16,7 @@ dependencies:
 - cxx-compiler
 - cython>=3.0.0
 - doxygen=1.9.1
-- gcc_linux-aarch64=11.*
+- gcc_linux-aarch64=13.*
 - libcufile-dev
 - libcurl>=8.5.0,<9.0a0
 - moto>=4.0.8
@@ -37,6 +37,6 @@ dependencies:
 - sphinx
 - sphinx-click
 - sphinx_rtd_theme
-- sysroot_linux-aarch64=2.17
+- sysroot_linux-aarch64=2.28
 - zarr>=2.0.0,<3.0.0a0
 name: all_cuda-125_arch-aarch64
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -16,7 +16,7 @@ dependencies:
 - cxx-compiler
 - cython>=3.0.0
 - doxygen=1.9.1
-- gcc_linux-64=11.*
+- gcc_linux-64=13.*
 - libcufile-dev
 - libcurl>=8.5.0,<9.0a0
 - moto>=4.0.8
@@ -37,6 +37,6 @@ dependencies:
 - sphinx
 - sphinx-click
 - sphinx_rtd_theme
-- sysroot_linux-64=2.17
+- sysroot_linux-64=2.28
 - zarr>=2.0.0,<3.0.0a0
 name: all_cuda-125_arch-x86_64
diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml
@@ -33,10 +33,8 @@ build:
     - SCCACHE_S3_USE_SSL
     - SCCACHE_S3_NO_CREDENTIALS
   ignore_run_exports_from:
-    {% if cuda_major == "11" %}
-    - {{ compiler('cuda') }}
-    {% else %}
     - {{ compiler('cuda') }}
+    {% if cuda_major != "11" %}
     - cuda-cudart-dev
     - libcufile-dev  # [linux]
     {% endif %}

diff --git a/conda/recipes/libkvikio/meta.yaml b/conda/recipes/libkvikio/meta.yaml
@@ -64,10 +64,8 @@ outputs:
       run_exports:
         - {{ pin_subpackage("libkvikio", max_pin="x.x") }}
       ignore_run_exports_from:
-        {% if cuda_major == "11" %}
-        - {{ compiler('cuda') }}
-        {% else %}
         - {{ compiler('cuda') }}
+        {% if cuda_major != "11" %}
         - libcufile-dev  # [linux]
         {% endif %}
     requirements:
@@ -101,10 +99,8 @@ outputs:
       number: {{ GIT_DESCRIBE_NUMBER }}
       string: cuda{{ cuda_major }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
       ignore_run_exports_from:
-        {% if cuda_major == "11" %}
-        - {{ compiler('cuda') }}
-        {% else %}
         - {{ compiler('cuda') }}
+        {% if cuda_major != "11" %}
         - cuda-cudart-dev
         - libcufile-dev  # [linux]
         {% endif %}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -128,14 +128,28 @@ dependencies:
         matrices:
           - matrix:
               arch: x86_64
+              cuda: "11.8"
             packages:
               - gcc_linux-64=11.*
-              - sysroot_linux-64=2.17
+              - sysroot_linux-64=2.28
           - matrix:
               arch: aarch64
+              cuda: "11.8"
             packages:
               - gcc_linux-aarch64=11.*
-              - sysroot_linux-aarch64=2.17
+              - sysroot_linux-aarch64=2.28
+          - matrix:
+              arch: x86_64
+              cuda: "12.*"
+            packages:
+              - gcc_linux-64=13.*
+              - sysroot_linux-64=2.28
+          - matrix:
+              arch: aarch64
+              cuda: "12.*"
+            packages:
+              - gcc_linux-aarch64=13.*
+              - sysroot_linux-aarch64=2.28
       - output_types: conda
         matrices:
           - matrix: