From e3c4151e3e81d4d2c5437550d81011593ad223c0 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 18 May 2022 16:34:44 -0700 Subject: [PATCH 1/6] Sort `install_requires` --- python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py index 7cbc92638..938fc1e6d 100644 --- a/python/setup.py +++ b/python/setup.py @@ -34,6 +34,6 @@ ) }, cmdclass=versioneer.get_cmdclass(), - install_requires=["numba", "cuda-python"], + install_requires=["cuda-python", "numba"], zip_safe=False, ) From 918bb3dc95e42113895c78e08c3fb67d25c76fcb Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 18 May 2022 16:34:49 -0700 Subject: [PATCH 2/6] Add `cuda-python` to `setup.cfg` --- python/setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/python/setup.cfg b/python/setup.cfg index df5c37624..b3c8d0e59 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -52,6 +52,7 @@ skip= [options] packages = find: install_requires = + cuda-python numpy numba>=0.49 python_requires = >=3.8 From 29ecf26f8e4b3a514fd9dc2e6aed47217645185b Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 18 May 2022 16:34:51 -0700 Subject: [PATCH 3/6] Add `numpy` to `setup.py` --- python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py index 938fc1e6d..eb7b67ee1 100644 --- a/python/setup.py +++ b/python/setup.py @@ -34,6 +34,6 @@ ) }, cmdclass=versioneer.get_cmdclass(), - install_requires=["cuda-python", "numba"], + install_requires=["cuda-python", "numpy", "numba"], zip_safe=False, ) From 401b187fc73a45007c5b02c993b4ad3fe8b2a20d Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 18 May 2022 16:35:06 -0700 Subject: [PATCH 4/6] Require `cuda-python` version `11.5.0+` This is consistent with other version constraints on `cuda-python` already included here. --- python/setup.cfg | 2 +- python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/setup.cfg b/python/setup.cfg index b3c8d0e59..2a7ece23c 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -52,7 +52,7 @@ skip= [options] packages = find: install_requires = - cuda-python + cuda-python>=11.5,<12.0 numpy numba>=0.49 python_requires = >=3.8 diff --git a/python/setup.py b/python/setup.py index eb7b67ee1..c3fce4c84 100644 --- a/python/setup.py +++ b/python/setup.py @@ -34,6 +34,6 @@ ) }, cmdclass=versioneer.get_cmdclass(), - install_requires=["cuda-python", "numpy", "numba"], + install_requires=["cuda-python>=11.5,<12.0", "numpy", "numba"], zip_safe=False, ) From eb9e5a08adf20d99b2c270b8cc53b85b4e8f3bee Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 18 May 2022 16:35:24 -0700 Subject: [PATCH 5/6] Require `numpy` version `1.19+` This is consistent with RAPIDS own NumPy version constraint. --- conda/environments/rmm_dev_cuda11.5.yml | 2 +- conda/environments/rmm_dev_cuda11.6.yml | 2 +- conda/recipes/rmm/meta.yaml | 2 +- python/setup.cfg | 2 +- python/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/environments/rmm_dev_cuda11.5.yml b/conda/environments/rmm_dev_cuda11.5.yml index 10cea6321..fc9167500 100644 --- a/conda/environments/rmm_dev_cuda11.5.yml +++ b/conda/environments/rmm_dev_cuda11.5.yml @@ -12,7 +12,7 @@ dependencies: - isort=5.6.4 - python>=3.8,<3.10 - numba>=0.49 -- numpy +- numpy>=1.19 - cffi>=1.10.0 - pytest - cudatoolkit=11.5 diff --git a/conda/environments/rmm_dev_cuda11.6.yml b/conda/environments/rmm_dev_cuda11.6.yml index 7681e4580..3fa2fbb6e 100644 --- a/conda/environments/rmm_dev_cuda11.6.yml +++ b/conda/environments/rmm_dev_cuda11.6.yml @@ -12,7 +12,7 @@ dependencies: - isort=5.6.4 - python>=3.8,<3.10 - numba>=0.49 -- numpy +- numpy>=1.19 - cffi>=1.10.0 - pytest - cudatoolkit=11.6 diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 5d5a7b224..0c89749af 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -36,7 +36,7 @@ requirements: run: - python - numba >=0.49 - - numpy + - numpy >=1.19 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - cuda-python >=11.5,<12.0 diff --git a/python/setup.cfg b/python/setup.cfg index 2a7ece23c..de2d6a679 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -53,6 +53,6 @@ skip= packages = find: install_requires = cuda-python>=11.5,<12.0 - numpy + numpy>=1.19 numba>=0.49 python_requires = >=3.8 diff --git a/python/setup.py b/python/setup.py index c3fce4c84..1cb50e61d 100644 --- a/python/setup.py +++ b/python/setup.py @@ -34,6 +34,6 @@ ) }, cmdclass=versioneer.get_cmdclass(), - install_requires=["cuda-python>=11.5,<12.0", "numpy", "numba"], + install_requires=["cuda-python>=11.5,<12.0", "numpy>=1.19", "numba"], zip_safe=False, ) From 8b377b4214a77b70f5d23fbf4cc339f360e05a63 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 18 May 2022 16:35:30 -0700 Subject: [PATCH 6/6] Require `numba` version `0.49.0+` This is consitent with other version constraints on `numba` in this repo so use it `install_requires` too. --- python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py index 1cb50e61d..24ac9c7ee 100644 --- a/python/setup.py +++ b/python/setup.py @@ -34,6 +34,6 @@ ) }, cmdclass=versioneer.get_cmdclass(), - install_requires=["cuda-python>=11.5,<12.0", "numpy>=1.19", "numba"], + install_requires=["cuda-python>=11.5,<12.0", "numpy>=1.19", "numba>=0.49"], zip_safe=False, )