Merge pull request #577 from rapidsai/branch-23.06

Forward-merge branch-23.06 to branch-23.08
rapidsai · May 30, 2023 · 6a3ba26 · 6a3ba26
2 parents 13439a9 + c993961
commit 6a3ba26
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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