Py3.11 sync branch with main

buildscripts/incremental/build.sh

@@ -9,7 +9,7 @@ set -v -e
 
 git clone https://github.com/numba/llvmlite 
 pushd llvmlite
-git fetch origin pull/907/head:pr/907
+git fetch origin pull/907/merge:pr/907
 git checkout pr/907
 python -m pip install . 
 popd

buildscripts/incremental/setup_conda_environment.sh

@@ -71,7 +71,7 @@ elif  [[ $(uname) == Darwin ]]; then
 fi
 
 # Install latest correct build
-$CONDA_INSTALL conda-forge::llvmdev=11
+$CONDA_INSTALL -c conda-forge numba/label/pynext_ci::llvmdev=14
 
 # Install importlib-metadata for Python < 3.9
 if [ $PYTHON \< "3.9" ]; then $CONDA_INSTALL importlib_metadata; fi

buildscripts/incremental/test.sh

@@ -126,5 +126,5 @@ echo "INFO: Running slice of discovered tests: ($TEST_START_INDEX,None,$TEST_COU
 # else
 #     NUMBA_ENABLE_CUDASIM=1 $SEGVCATCH python -m numba.runtests -b -j "$TEST_START_INDEX,None,$TEST_COUNT" --exclude-tags='long_running' -m $TEST_NPROCS -- numba.tests
 # fi
-NUMBA_ENABLE_CUDASIM=1 $SEGVCATCH python -m numba.runtests -b -j "$TEST_START_INDEX,None,$TEST_COUNT" --exclude-tags='long_running' -m $TEST_NPROCS -- numba.tests
+NUMBA_ENABLE_CUDASIM=1 $SEGVCATCH python -m numba.runtests -b -j "$TEST_START_INDEX:$TEST_COUNT" --exclude-tags='long_running' -m $TEST_NPROCS -- numba.tests
 

numba/_devicearray.cpp

@@ -103,7 +103,7 @@ PyTypeObject DeviceArrayType = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else

numba/_dispatcher.cpp

@@ -217,11 +217,11 @@ call_trace_protected(Py_tracefunc func, PyObject *obj,
 {
     PyObject *type, *value, *traceback;
     int err;
-    _PyErr_Fetch(&type, &value, &traceback);
+    PyErr_Fetch(&type, &value, &traceback);
     err = call_trace(func, obj, tstate, frame, trace_info, what, arg);
     if (err == 0)
     {
-        _PyErr_Restore(type, value, traceback);
+        PyErr_Restore(type, value, traceback);
         return 0;
     }
     else
@@ -1270,7 +1270,7 @@ static PyTypeObject DispatcherType = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else

numba/_dynfunc.c

@@ -153,7 +153,7 @@ static PyTypeObject EnvironmentType = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else
@@ -279,7 +279,7 @@ static PyTypeObject ClosureType = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10 || (PY_MINOR_VERSION == 11)))
 #error "Python minor version is not supported."
 #endif
 #else
@@ -506,7 +506,7 @@ static PyTypeObject GeneratorType = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else

numba/core/runtime/_nrt_python.c

@@ -236,7 +236,7 @@ static PyTypeObject MemInfoType = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else

numba/experimental/jitclass/_box.c

@@ -117,7 +117,7 @@ static PyTypeObject BoxType = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else

numba/mviewbuf.c

@@ -351,7 +351,7 @@ static PyTypeObject MemAllocType = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else

numba/np/ufunc/_internal.c

@@ -107,7 +107,7 @@ PyTypeObject PyUFuncCleaner_Type = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else
@@ -778,7 +778,7 @@ PyTypeObject PyDUFunc_Type = {
 /* WARNING: Do not remove this, only modify it! It is a version guard to
  * act as a reminder to update this struct on Python version update! */
 #if (PY_MAJOR_VERSION == 3)
-#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
+#if ! ((PY_MINOR_VERSION == 8) || (PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10) || (PY_MINOR_VERSION == 11))
 #error "Python minor version is not supported."
 #endif
 #else

numba/tests/test_ir_inlining.py

@@ -446,7 +446,7 @@ def bar(x):
         # block count changes with Python version due to bytecode differences.
         if utils.PYVERSION in ((3, 8), (3, 9)):
             bc = 33
-        elif utils.PYVERSION == (3, 10):
+        elif utils.PYVERSION in ((3, 10), (3, 11)):
             bc = 35
         else:
             raise ValueError(f"Unsupported Python version: {utils.PYVERSION}")

numba/tests/test_parfors.py

@@ -49,6 +49,7 @@
                       needs_subprocess)
 from numba.core.extending import register_jitable
 from numba.core.bytecode import _fix_LOAD_GLOBAL_arg
+from numba.core import utils
 
 import cmath
 import unittest