From c9939611b1d394d839921ed83a4b45f366e2af68 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 30 May 2023 14:16:44 -0700 Subject: [PATCH] Refresh requirements (#576) * Require Numba 0.57+ consistently * Require NumPy 1.21+ (to align with [Numba 0.57.0's NumPy minimum]( https://github.com/numba/numba/blob/0.57.0/setup.py#L25 )) * Allow NumPy 1.24 (soften upper bounds) * Replace deprecated `np.int` with `int` Authors: - https://github.com/jakirkham Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - Adam Thompson (https://github.com/awthomp) - Bradley Dice (https://github.com/bdice) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/cusignal/pull/576 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/recipes/cusignal/meta.yaml | 4 ++-- dependencies.yaml | 4 ++-- python/cusignal/convolution/_convolution_cuda.py | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 8934d514..604a41f2 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -11,8 +11,8 @@ dependencies: - ipython - matplotlib-base - notebook -- numba >=0.49.0 -- numpy >=1.19,<1.24 +- numba >=0.57.0 +- numpy >=1.21 - numpydoc - pre-commit - pydata-sphinx-theme diff --git a/conda/recipes/cusignal/meta.yaml b/conda/recipes/cusignal/meta.yaml index a12693e5..b1d9ef09 100644 --- a/conda/recipes/cusignal/meta.yaml +++ b/conda/recipes/cusignal/meta.yaml @@ -28,8 +28,8 @@ requirements: - setuptools run: - cupy >=12.0.0 - - numba >=0.49.0 - - numpy >=1.19,<1.24 + - numba >=0.57.0 + - numpy >=1.21 - python - scipy >=1.6.0 diff --git a/dependencies.yaml b/dependencies.yaml index 2990daff..a6540ae4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -96,8 +96,8 @@ dependencies: - output_types: [conda, requirements] packages: - cupy >=12.0.0 - - numba >=0.49.0 - - numpy >=1.19,<1.24 + - numba >=0.57.0 + - numpy >=1.21 - scipy >=1.6.0 test_notebooks: common: diff --git a/python/cusignal/convolution/_convolution_cuda.py b/python/cusignal/convolution/_convolution_cuda.py index dcf7b46f..e9243d7a 100644 --- a/python/cusignal/convolution/_convolution_cuda.py +++ b/python/cusignal/convolution/_convolution_cuda.py @@ -400,7 +400,7 @@ def _convolve( in2 = in2.astype(promType) # Create empty array to hold number of aout dimensions - out_dimens = np.empty(in1.ndim, np.int) + out_dimens = np.empty(in1.ndim, int) if val == VALID: for i in range(in1.ndim): out_dimens[i] = ( @@ -465,7 +465,7 @@ def _convolve2d(in1, in2, use_convolve, mode, boundary, fillvalue): raise Exception("Unable to create fill array") # Create empty array to hold number of aout dimensions - out_dimens = np.empty(in1.ndim, np.int) + out_dimens = np.empty(in1.ndim, int) if val == VALID: for i in range(in1.ndim): out_dimens[i] = in1.shape[i] - in2.shape[i] + 1 @@ -539,7 +539,7 @@ def _convolve1d2o(in1, in2, mode): in2 = in2.astype(promType) # Create empty array to hold number of aout dimensions - out_dimens = np.empty(in1.ndim, np.int) + out_dimens = np.empty(in1.ndim, int) if val == VALID: for i in range(in1.ndim): out_dimens[i] = in1.shape[i] - in2.shape[i] + 1 @@ -602,7 +602,7 @@ def _convolve1d3o(in1, in2, mode): in2 = in2.astype(promType) # Create empty array to hold number of aout dimensions - out_dimens = np.empty(in1.ndim, np.int) + out_dimens = np.empty(in1.ndim, int) if val == VALID: for i in range(in1.ndim): out_dimens[i] = in1.shape[i] - in2.shape[i] + 1