Merge branch 'NVIDIA:main' into mmason-nvidia/bugfix/lto-linking

Author: mmason-nvidia

ci/test_thirdparty_cudf.sh

@@ -44,7 +44,8 @@ rapids-logger "Run Scalar UDF tests"
 python -m pytest python/cudf/cudf/tests/dataframe/methods/test_apply.py -W ignore::UserWarning
 
 rapids-logger "Run GroupBy UDF tests"
-python -m pytest python/cudf/cudf/tests/groupby/test_apply.py -k test_groupby_apply_jit -W ignore::UserWarning
+# Run JIT engine tests and tests that check jittability before falling back
+python -m pytest python/cudf/cudf/tests/groupby/test_apply.py -k test_groupby_apply -W ignore::UserWarning
 
 rapids-logger "Run NRT Stats Counting tests"
 python -m pytest python/cudf/cudf/tests/private_objects/test_nrt_stats.py  -W ignore::UserWarning

greptile.json

@@ -0,0 +1,7 @@
+{
+  "sequenceDiagramSection": {
+    "included": false,
+    "collapsible": false,
+    "defaultOpen": false
+  }
+}

numba_cuda/VERSION

@@ -1 +1 @@
-0.21.3
+0.22.1

numba_cuda/numba/cuda/cext/_devicearray.cpp

@@ -12,7 +12,6 @@
 #include "frameobject.h"
 #include "traceback.h"
 #include "typeconv.hpp"
-#include "_devicearray.h"
 
 /*
  * Notes on the C_TRACE macro:
@@ -940,37 +939,6 @@ Dispatcher_cuda_call(Dispatcher *self, PyObject *args, PyObject *kws)
     return retval;
 }
 
-static int
-import_devicearray(void)
-{
-    PyObject *devicearray = PyImport_ImportModule(NUMBA_DEVICEARRAY_IMPORT_NAME);
-    if (devicearray == NULL) {
-        return -1;
-    }
-
-    PyObject *d = PyModule_GetDict(devicearray);
-    if (d == NULL) {
-      Py_DECREF(devicearray);
-      return -1;
-    }
-
-    PyObject *key = PyUnicode_FromString("_DEVICEARRAY_API");
-    PyObject *c_api = PyDict_GetItemWithError(d, key);
-    int retcode = 0;
-    if (PyCapsule_IsValid(c_api, NUMBA_DEVICEARRAY_IMPORT_NAME "._DEVICEARRAY_API")) {
-      DeviceArray_API = (void**)PyCapsule_GetPointer(c_api, NUMBA_DEVICEARRAY_IMPORT_NAME "._DEVICEARRAY_API");
-      if (DeviceArray_API == NULL) {
-        retcode = -1;
-      }
-    } else {
-      retcode = -1;
-    }
-
-    Py_DECREF(key);
-    Py_DECREF(devicearray);
-    return retcode;
-}
-
 static PyMethodDef Dispatcher_methods[] = {
     { "_clear", (PyCFunction)Dispatcher_clear, METH_NOARGS, NULL },
     { "_insert", (PyCFunction)Dispatcher_Insert, METH_VARARGS | METH_KEYWORDS,
@@ -1076,12 +1044,6 @@ static PyMethodDef ext_methods[] = {
 
 
 MOD_INIT(_dispatcher) {
-    if (import_devicearray() < 0) {
-      PyErr_Print();
-      PyErr_SetString(PyExc_ImportError, NUMBA_DEVICEARRAY_IMPORT_NAME " failed to import");
-      return MOD_ERROR_VAL;
-    }
-
     PyObject *m;
     MOD_DEF(m, "_dispatcher", "No docs", ext_methods)
     if (m == NULL)