From 643b0900761fb48976d4e07df3b0da793a38e899 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Tue, 10 Jun 2025 14:34:07 -0400 Subject: [PATCH] refactor(conda): remove cuda11 conditionals from conda recipes --- conda/recipes/cucim/conda_build_config.yaml | 9 +++------ conda/recipes/cucim/meta.yaml | 10 ---------- conda/recipes/libcucim/meta.yaml | 18 ------------------ 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/conda/recipes/cucim/conda_build_config.yaml b/conda/recipes/cucim/conda_build_config.yaml index 0a1108eb5..caf5489e1 100644 --- a/conda/recipes/cucim/conda_build_config.yaml +++ b/conda/recipes/cucim/conda_build_config.yaml @@ -1,14 +1,11 @@ c_compiler_version: - - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - 13 cxx_compiler_version: - - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - 13 cuda_compiler: - - cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - cuda-nvcc c_stdlib: - sysroot diff --git a/conda/recipes/cucim/meta.yaml b/conda/recipes/cucim/meta.yaml index f7ed9387d..c963a8756 100644 --- a/conda/recipes/cucim/meta.yaml +++ b/conda/recipes/cucim/meta.yaml @@ -19,9 +19,7 @@ build: string: cuda{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} ignore_run_exports_from: - {{ compiler('cuda') }} - {% if cuda_major != "11" %} - cuda-cudart-dev - {% endif %} script_env: - AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY @@ -43,11 +41,7 @@ requirements: build: - {{ compiler("c") }} - {{ compiler("cxx") }} - {% if cuda_major == "11" %} - - {{ compiler('cuda') }} ={{ cuda_version }} - {% else %} - {{ compiler('cuda') }} - {% endif %} - cuda-version ={{ cuda_version }} - cmake {{ cmake_version }} - make @@ -56,9 +50,7 @@ requirements: host: - click - cuda-version ={{ cuda_version }} - {% if cuda_major != "11" %} - cuda-cudart-dev - {% endif %} - cupy >=12.0.0 - libcucim ={{ version }} - python @@ -68,9 +60,7 @@ requirements: - setuptools >=61.0.0 run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - {% if cuda_major != "11" %} - cuda-cudart - {% endif %} - numpy >=1.23,<3.0a0 - click - cupy >=12.0.0 diff --git a/conda/recipes/libcucim/meta.yaml b/conda/recipes/libcucim/meta.yaml index 75b30f7a9..73a4bfe73 100644 --- a/conda/recipes/libcucim/meta.yaml +++ b/conda/recipes/libcucim/meta.yaml @@ -20,11 +20,9 @@ build: - openslide ignore_run_exports_from: - {{ compiler('cuda') }} - {% if cuda_major != "11" %} - cuda-cudart-dev - libcufile-dev # [linux64] - libnvjpeg-dev - {% endif %} script_env: - AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY @@ -46,11 +44,7 @@ requirements: build: - {{ compiler("c") }} - {{ compiler("cxx") }} - {% if cuda_major == "11" %} - - {{ compiler('cuda') }} ={{ cuda_version }} - {% else %} - {{ compiler('cuda') }} - {% endif %} - cuda-version ={{ cuda_version }} - binutils - cmake {{ cmake_version }} @@ -60,29 +54,17 @@ requirements: - yasm # [x86_64] host: - cuda-version ={{ cuda_version }} - {% if cuda_major == "11" %} - - libcufile {{ cuda11_libcufile_host_version }} # [linux64] - - libcufile-dev {{ cuda11_libcufile_host_version }} # [linux64] - - libnvjpeg {{ cuda11_libnvjpeg_host_version }} - - libnvjpeg-dev {{ cuda11_libnvjpeg_host_version }} - {% else %} - cuda-cudart-dev - libcufile-dev # [linux64] - libnvjpeg-dev - libnvjpeg-static - {% endif %} - nvtx-c >=3.1.0 - openslide run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - {% if cuda_major == "11" %} - - cudatoolkit - - libcufile {{ cuda11_libcufile_run_version }} # [linux64] - {% else %} - cuda-cudart - libcufile # [linux64] - libnvjpeg - {% endif %} run_constrained: - {{ pin_compatible('openslide') }}