Switch to numba 0.58

IntelPython · Sep 28, 2023 · 631d633 · 631d633
1 parent 8d0457b
commit 631d633
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
@@ -14,7 +14,7 @@ env:
   PACKAGE_NAME: numba-dpex
   MODULE_NAME: numba_dpex
   # There is a separate action that removes defaults.
-  CHANNELS: 'dppy/label/dev,conda-forge,intel'
+  CHANNELS: 'dppy/label/dev,conda-forge,intel,numba,nodefaults'
   VER_JSON_NAME: 'version.json'
   VER_SCRIPT1: "import json; f = open('version.json', 'r'); j = json.load(f); f.close(); "
   VER_SCRIPT2: "d = j['numba-dpex'][0]; print('='.join((d[s] for s in ('version', 'build'))))"

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ on:
       numpy_version:
         default: '1.24.3'
       numba_version:
-        default: '0.57.0'
+        default: '0.58'
       # dpcpp_llvm_spirv_version:
       #   default: 'main'
       cython_version:

diff --git a/Dockerfile b/Dockerfile
@@ -42,7 +42,7 @@ ARG CMAKE_VERSION_BUILD=4
 
 # Python
 ARG INTEL_NUMPY_VERSION="==1.24.3"
-ARG INTEL_NUMBA_VERSION="==0.57.0"
+ARG INTEL_NUMBA_VERSION="==0.58"
 ARG CYTHON_VERSION="==0.29.35"
 ARG SCIKIT_BUILD_VERSION="==0.17.6"
 

diff --git a/environment.yml b/environment.yml
@@ -10,7 +10,7 @@ dependencies:
   - python=3.9
   - gxx_linux-64
   - dpcpp_linux-64
-  - numba >=0.57*
+  - numba ==0.58*
   - dpctl >=0.14*
   - dpnp >=0.11*
   - mkl >=2021.3.0  # for dpnp

diff --git a/environment/coverage.yml b/environment/coverage.yml
@@ -3,14 +3,13 @@ channels:
   - dppy/label/dev
   - numba
   - intel
-  - numba/label/dev
   - conda-forge
   - nodefaults
 dependencies:
   - libffi
   - gxx_linux-64
   - dpcpp_linux-64
-  - numba=0.57
+  - numba==0.58*
   - dpctl
   - dpnp
   - dpcpp-llvm-spirv

diff --git a/environment/docs.yml b/environment/docs.yml
@@ -3,14 +3,13 @@ channels:
   - dppy/label/dev
   - numba
   - intel
-  - numba/label/dev
   - conda-forge
   - nodefaults
 dependencies:
   - libffi
   - gxx_linux-64
   - dpcpp_linux-64
-  - numba=0.57
+  - numba==0.58*
   - scikit-build>=0.15*
   - cmake>=3.26*
   - dpctl

diff --git a/numba_dpex/__init__.py b/numba_dpex/__init__.py
@@ -19,16 +19,7 @@
 
 from numba_dpex.vectorizers import Vectorize as DpexVectorize
 
-from .numba_patches import (
-    patch_arrayexpr_tree_to_ir,
-    patch_is_ufunc,
-    patch_mk_alloc,
-)
-
-# Monkey patches
-patch_is_ufunc.patch()
-patch_mk_alloc.patch()
-patch_arrayexpr_tree_to_ir.patch()
+from .numba_patches import patch_arrayexpr_tree_to_ir, patch_is_ufunc
 
 
 def load_dpctl_sycl_interface():
@@ -77,12 +68,19 @@ def parse_sem_version(version_string: str) -> Tuple[int, int, int]:
 
 
 numba_sem_version = parse_sem_version(numba_version)
-if numba_sem_version < (0, 57, 0):
+if numba_sem_version < (0, 57, 0) or numba_sem_version >= (0, 59, 0):
     logging.warning(
-        "numba_dpex needs numba 0.57.0, using "
+        "numba_dpex needs at lease numba 0.57.0 but no more than 0.59.0, using "
         f"numba={numba_version} may cause unexpected behavior"
     )
 
+# Monkey patches
+patch_is_ufunc.patch()
+if numba_sem_version < (0, 58, 0):
+    from .numba_patches import patch_mk_alloc
+
+    patch_mk_alloc.patch()
+patch_arrayexpr_tree_to_ir.patch()
 
 dpctl_sem_version = parse_sem_version(dpctl.__version__)
 if dpctl_sem_version < (0, 14):