From 9b654287ae21990797daf078f54de7a1f459c2c8 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Wed, 19 Jan 2022 12:54:23 -0500 Subject: [PATCH 1/3] update environment file and conda recipe to allow CuPy 10.x --- conda/environments/env.yml | 2 +- conda/recipes/cucim/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/environments/env.yml b/conda/environments/env.yml index 1c10ab0b0..c5f6cb321 100644 --- a/conda/environments/env.yml +++ b/conda/environments/env.yml @@ -2,7 +2,7 @@ name: cucim channels: - conda-forge dependencies: - - cupy=9 + - cupy>=9,<11.0.0a0 - scikit-image=0.18.1 - openslide - zlib diff --git a/conda/recipes/cucim/meta.yaml b/conda/recipes/cucim/meta.yaml index 68cf5b83a..fb037196d 100644 --- a/conda/recipes/cucim/meta.yaml +++ b/conda/recipes/cucim/meta.yaml @@ -33,7 +33,7 @@ requirements: - python {{ python_version }}.* - libcucim {{ version }}.* - click - - cupy 9.* + - cupy >=9,<11 - numpy 1.17 - scipy - scikit-image 0.18.1 @@ -42,7 +42,7 @@ requirements: - python {{ python_version }}.* - libcucim {{ version }}.* - click - - cupy 9.* + - cupy >=9,<11 - {{ pin_compatible('numpy') }} - scipy - scikit-image 0.18.1 From f90d6d28f9fcc8e87c30b391b2dbe7b7d4a8b656 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Wed, 19 Jan 2022 13:02:14 -0500 Subject: [PATCH 2/3] Update meta.yaml --- conda/recipes/cucim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/cucim/meta.yaml b/conda/recipes/cucim/meta.yaml index 5ec1386eb..efd2b5085 100644 --- a/conda/recipes/cucim/meta.yaml +++ b/conda/recipes/cucim/meta.yaml @@ -42,7 +42,7 @@ requirements: - python {{ python_version }}.* - libcucim {{ version }}.* - click - - cupy >=9,<11 + - cupy >=9,<11.0.0a0 - {{ pin_compatible('numpy') }} - scipy - scikit-image 0.18.1 From c7c62bb19e24702435083b8fe530524d49258e4e Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Wed, 19 Jan 2022 13:39:43 -0500 Subject: [PATCH 3/3] Update conda/environments/env.yml --- conda/environments/env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/environments/env.yml b/conda/environments/env.yml index c5f6cb321..cc3a76762 100644 --- a/conda/environments/env.yml +++ b/conda/environments/env.yml @@ -2,7 +2,7 @@ name: cucim channels: - conda-forge dependencies: - - cupy>=9,<11.0.0a0 + - cupy>=9 - scikit-image=0.18.1 - openslide - zlib