From d8dd17def37d37d4b1c59dae8a7dd404edd7c729 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 14 Nov 2024 09:04:08 -0500 Subject: [PATCH 1/7] Pin numcodecs to version that support python 3.10 --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/kvikio/meta.yaml | 2 +- dependencies.yaml | 2 +- python/kvikio/pyproject.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 2de4597657..a3afe5f3d8 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -21,7 +21,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs !=0.12.0 +- numcodecs>=0.13.0,<14 - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-aarch64=11.8 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 8b63a6726b..90631f5b90 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -23,7 +23,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs !=0.12.0 +- numcodecs>=0.13.0,<14 - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-64=11.8 diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index 87759faf53..f956565db6 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -22,7 +22,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs !=0.12.0 +- numcodecs>=0.13.0,<14 - numpy>=1.23,<3.0a0 - numpydoc - nvcomp==4.1.0.6 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index e0a10af655..4f83587bb8 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -22,7 +22,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs !=0.12.0 +- numcodecs>=0.13.0,<14 - numpy>=1.23,<3.0a0 - numpydoc - nvcomp==4.1.0.6 diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index 3c41af3310..176696e44b 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -71,7 +71,7 @@ requirements: - cupy >=12.0.0 - zarr # See https://github.com/zarr-developers/numcodecs/pull/475 - - numcodecs !=0.12.0 + - numcodecs>=0.13.0,<14 - packaging - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} diff --git a/dependencies.yaml b/dependencies.yaml index fe85506ce5..852977216a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -356,7 +356,7 @@ dependencies: - numpy>=1.23,<3.0a0 - zarr # See https://github.com/zarr-developers/numcodecs/pull/475 - - numcodecs !=0.12.0 + - numcodecs>=0.13.0,<14 - packaging test_cpp: common: diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml index cafde598bd..2f391354d1 100644 --- a/python/kvikio/pyproject.toml +++ b/python/kvikio/pyproject.toml @@ -21,7 +21,7 @@ requires-python = ">=3.10" dependencies = [ "cupy-cuda11x>=12.0.0", "libkvikio==24.12.*,>=0.0.0a0", - "numcodecs !=0.12.0", + "numcodecs>=0.13.0,<14", "numpy>=1.23,<3.0a0", "nvidia-nvcomp==4.1.0.6", "packaging", From 9163b302bceda872bf9eab79756d39c4c5e7c3b7 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 14 Nov 2024 14:21:00 -0500 Subject: [PATCH 2/7] Update dependencies.yaml Co-authored-by: Bradley Dice --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 852977216a..08a96fb4fe 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -356,7 +356,7 @@ dependencies: - numpy>=1.23,<3.0a0 - zarr # See https://github.com/zarr-developers/numcodecs/pull/475 - - numcodecs>=0.13.0,<14 + - numcodecs>=0.13.0,<0.14.0a0 - packaging test_cpp: common: From 7a625bfea15ec453564c89cee5c3f3f126427e8f Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 14 Nov 2024 15:27:49 -0500 Subject: [PATCH 3/7] Apply tighter version pinning as recommended from code review Co-authored-by: jakirkham --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/kvikio/meta.yaml | 2 +- python/kvikio/pyproject.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index a3afe5f3d8..7da466f278 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -21,7 +21,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs>=0.13.0,<14 +- numcodecs>=0.13.0,<0.14.0a0 - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-aarch64=11.8 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 90631f5b90..f1905ede01 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -23,7 +23,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs>=0.13.0,<14 +- numcodecs>=0.13.0,<0.14.0a0 - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-64=11.8 diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index f956565db6..cd5fdf3eba 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -22,7 +22,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs>=0.13.0,<14 +- numcodecs>=0.13.0,<0.14.0a0 - numpy>=1.23,<3.0a0 - numpydoc - nvcomp==4.1.0.6 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 4f83587bb8..dc81e4a9cb 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -22,7 +22,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs>=0.13.0,<14 +- numcodecs>=0.13.0,<0.14.0a0 - numpy>=1.23,<3.0a0 - numpydoc - nvcomp==4.1.0.6 diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index 176696e44b..6c2cdf84fa 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -71,7 +71,7 @@ requirements: - cupy >=12.0.0 - zarr # See https://github.com/zarr-developers/numcodecs/pull/475 - - numcodecs>=0.13.0,<14 +- numcodecs>=0.13.0,<0.14.0 - packaging - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml index 2f391354d1..4243dc0d0a 100644 --- a/python/kvikio/pyproject.toml +++ b/python/kvikio/pyproject.toml @@ -21,7 +21,7 @@ requires-python = ">=3.10" dependencies = [ "cupy-cuda11x>=12.0.0", "libkvikio==24.12.*,>=0.0.0a0", - "numcodecs>=0.13.0,<14", + "numcodecs>=0.13.0,<0.14.0a0", "numpy>=1.23,<3.0a0", "nvidia-nvcomp==4.1.0.6", "packaging", From 7f4a556a6915d22600dd4488803cf9b72fa417ec Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 14 Nov 2024 15:59:03 -0800 Subject: [PATCH 4/7] Fix spacing in Conda recipe --- conda/recipes/kvikio/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index 6c2cdf84fa..9e5c936da8 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -71,7 +71,7 @@ requirements: - cupy >=12.0.0 - zarr # See https://github.com/zarr-developers/numcodecs/pull/475 -- numcodecs>=0.13.0,<0.14.0 + - numcodecs >=0.13.0,<0.14.0a0 - packaging - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} From b37a893a6ed77bd7de54ccfd83bcc7dd4469751a Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 15 Nov 2024 11:42:15 -0500 Subject: [PATCH 5/7] update the dependencies.yaml with more explanation --- dependencies.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 08a96fb4fe..92b626b771 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -355,7 +355,9 @@ dependencies: packages: - numpy>=1.23,<3.0a0 - zarr - # See https://github.com/zarr-developers/numcodecs/pull/475 + # Pinned to the 0.13 for the following reasons: + # https://github.com/zarr-developers/numcodecs/pull/475 + # 0.14.0 doesn't offer python 3.10 support - numcodecs>=0.13.0,<0.14.0a0 - packaging test_cpp: From 86a8454de9edb2eca2b16c5c3204c176129b0951 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 25 Nov 2024 17:32:54 -0500 Subject: [PATCH 6/7] Loosen numcodecs version as recommended in review --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/kvikio/meta.yaml | 2 +- dependencies.yaml | 5 +---- python/kvikio/pyproject.toml | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 7da466f278..3926f5fbfc 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -21,7 +21,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs>=0.13.0,<0.14.0a0 +- numcodecs>=0.13.0 - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-aarch64=11.8 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index f1905ede01..8279ea1411 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -23,7 +23,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs>=0.13.0,<0.14.0a0 +- numcodecs>=0.13.0 - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-64=11.8 diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index cd5fdf3eba..34e4e5371f 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -22,7 +22,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs>=0.13.0,<0.14.0a0 +- numcodecs>=0.13.0 - numpy>=1.23,<3.0a0 - numpydoc - nvcomp==4.1.0.6 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index dc81e4a9cb..96f0f6e63c 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -22,7 +22,7 @@ dependencies: - libcurl>=7.87.0 - moto>=4.0.8 - ninja -- numcodecs>=0.13.0,<0.14.0a0 +- numcodecs>=0.13.0 - numpy>=1.23,<3.0a0 - numpydoc - nvcomp==4.1.0.6 diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index 9e5c936da8..aa0d89c052 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -71,7 +71,7 @@ requirements: - cupy >=12.0.0 - zarr # See https://github.com/zarr-developers/numcodecs/pull/475 - - numcodecs >=0.13.0,<0.14.0a0 + - numcodecs >>=0.13.0 - packaging - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} diff --git a/dependencies.yaml b/dependencies.yaml index 92b626b771..59bbe7d7cf 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -355,10 +355,7 @@ dependencies: packages: - numpy>=1.23,<3.0a0 - zarr - # Pinned to the 0.13 for the following reasons: - # https://github.com/zarr-developers/numcodecs/pull/475 - # 0.14.0 doesn't offer python 3.10 support - - numcodecs>=0.13.0,<0.14.0a0 + - numcodecs>=0.13.0 - packaging test_cpp: common: diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml index 4243dc0d0a..ccf967d804 100644 --- a/python/kvikio/pyproject.toml +++ b/python/kvikio/pyproject.toml @@ -21,7 +21,7 @@ requires-python = ">=3.10" dependencies = [ "cupy-cuda11x>=12.0.0", "libkvikio==24.12.*,>=0.0.0a0", - "numcodecs>=0.13.0,<0.14.0a0", + "numcodecs>=0.13.0", "numpy>=1.23,<3.0a0", "nvidia-nvcomp==4.1.0.6", "packaging", From 6d09c8ef3e9b234a422c4a084855c983f2319876 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 25 Nov 2024 16:36:39 -0600 Subject: [PATCH 7/7] Update conda/recipes/kvikio/meta.yaml --- conda/recipes/kvikio/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml index aa0d89c052..f5fdb97455 100644 --- a/conda/recipes/kvikio/meta.yaml +++ b/conda/recipes/kvikio/meta.yaml @@ -71,7 +71,7 @@ requirements: - cupy >=12.0.0 - zarr # See https://github.com/zarr-developers/numcodecs/pull/475 - - numcodecs >>=0.13.0 + - numcodecs >=0.13.0 - packaging - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %}