Manual changes.

rapidsai · Jan 13, 2025 · fa88f0d · fa88f0d
1 parent ef8d856
commit fa88f0d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -43,7 +43,7 @@ dependencies:
 - scikit-image>=0.19.0,<0.25.0a0
 - scipy>=1.6.0
 - sphinx<6
-- sysroot_linux-64==2.17
+- sysroot_linux-64==2.28
 - tifffile>=2022.7.28
 - yasm
 - pip:

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -14,7 +14,7 @@ dependencies:
 - cuda-version=12.5
 - cupy>=12.0.0
 - cxx-compiler
-- gcc_linux-64=11.*
+- gcc_linux-64>=11,<14
 - imagecodecs>=2021.6.8
 - ipython
 - lazy_loader>=0.1
@@ -42,7 +42,7 @@ dependencies:
 - scikit-image>=0.19.0,<0.25.0a0
 - scipy>=1.6.0
 - sphinx<6
-- sysroot_linux-64==2.17
+- sysroot_linux-64==2.28
 - tifffile>=2022.7.28
 - yasm
 - pip:

diff --git a/conda/recipes/cucim/meta.yaml b/conda/recipes/cucim/meta.yaml
@@ -18,10 +18,8 @@ build:
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: cuda{{ cuda_major }}_py{{ py_version }}_{{ 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
     {% endif %}
   script_env:

diff --git a/conda/recipes/libcucim/meta.yaml b/conda/recipes/libcucim/meta.yaml
@@ -19,10 +19,8 @@ build:
   ignore_run_exports:
     - openslide
   ignore_run_exports_from:
-    {% if cuda_major == "11" %}
-    - {{ compiler('cuda') }}
-    {% else %}
     - {{ compiler('cuda') }}
+    {% if cuda_major != "11" %}
     - cuda-cudart-dev
     - libcufile-dev  # [linux64]
     - libnvjpeg-dev

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -107,29 +107,37 @@ dependencies:
           - matrix:
               arch: x86_64
             packages:
-              - gcc_linux-64=11.*
-              - sysroot_linux-64==2.17
+              - sysroot_linux-64==2.28
               - yasm
           - matrix:
               arch: aarch64
             packages:
-              - gcc_linux-aarch64=11.*
-              - sysroot_linux-aarch64==2.17
+              - sysroot_linux-aarch64==2.28
       - output_types: conda
         matrices:
           - matrix:
               arch: x86_64
               cuda: "11.8"
             packages:
+              - gcc_linux-64=11.*
               - nvcc_linux-64=11.8
           - matrix:
               arch: aarch64
               cuda: "11.8"
             packages:
+              - gcc_linux-aarch64=11.*
               - nvcc_linux-aarch64=11.8
           - matrix:
+              arch: x86_64
+              cuda: "12.*"
+            packages:
+              - gcc_linux-64>=11,<14
+              - cuda-nvcc
+          - matrix:
+              arch: aarch64
               cuda: "12.*"
             packages:
+              - gcc_linux-aarch64>=11,<14
               - cuda-nvcc
   checks:
     common: