Merge pull request pyqtgraph#3025 from pijyoi/remove-numba-rescaledata

remove numba for rescaleData

Author: j9ac9k

pyqtgraph/functions.py

@@ -18,7 +18,6 @@
 from .metaarray import MetaArray
 from .Qt import QT_LIB, QtCore, QtGui
 from .util.cupy_helper import getCupy
-from .util.numba_helper import getNumbaFunctions
 
 # in order of appearance in this file.
 # add new functions to this list only if they are to reside in pg namespace.
@@ -1268,11 +1267,6 @@ def rescaleData(data, scale, offset, dtype=None, clip=None):
         # don't copy if no change in dtype
         return data_out.astype(out_dtype, copy=False)
 
-    numba_fn = getNumbaFunctions()
-    if numba_fn and clip is not None:
-        # if we got here by makeARGB(), clip will not be None at this point
-        return numba_fn.rescaleData(data, scale, offset, out_dtype, clip)
-
     return _rescaleData_nditer(data, scale, offset, work_dtype, out_dtype, clip)
 
 

pyqtgraph/functions_numba.py

@@ -1,26 +1,6 @@
 import numba
 import numpy as np
 
-rescale_functions = {}
-
-def rescale_clip_source(xx, scale, offset, vmin, vmax, yy):
-    for i in range(xx.size):
-        val = (xx[i] - offset) * scale
-        yy[i] = min(max(val, vmin), vmax)
-
-def rescaleData(data, scale, offset, dtype, clip):
-    data_out = np.empty_like(data, dtype=dtype)
-    key = (data.dtype.name, data_out.dtype.name)
-    func = rescale_functions.get(key)
-    if func is None:
-        func = numba.guvectorize(
-            [f'{key[0]}[:],f8,f8,f8,f8,{key[1]}[:]'],
-            '(n),(),(),(),()->(n)',
-            nopython=True)(rescale_clip_source)
-        rescale_functions[key] = func
-    func(data, scale, offset, clip[0], clip[1], out=data_out)
-    return data_out
-
 @numba.jit(nopython=True)
 def rescale_and_lookup(data, scale, offset, lut):
     # data should be floating point and 2d

tests/test_makeARGB.py

@@ -9,11 +9,6 @@
 from .makeARGB_test_data import EXPECTED_OUTPUTS, INPUTS, LEVELS, LUTS
 
 
-try:
-    import numba
-except ImportError:
-    pass
-
 try:
     import cupy
 except ImportError:
@@ -35,7 +30,6 @@ def _makeARGB(*args, **kwds):
 @pytest.mark.parametrize('acceleration', [
         pytest.param('numpy'),
         pytest.param('cupy', marks=pytest.mark.skipif('cupy' not in sys.modules, reason="CuPy not available")),
-        pytest.param('numba', marks=pytest.mark.skipif('numba' not in sys.modules, reason="numba not available"))
     ]
 )
 @pytest.mark.parametrize('dtype', [np.uint8, np.uint16, np.float32])
@@ -45,9 +39,7 @@ def _makeARGB(*args, **kwds):
 @pytest.mark.parametrize('scale', [None, 232, 13333])
 @pytest.mark.parametrize('use_rgba', [True, False])
 def test_makeARGB_against_generated_references(acceleration, dtype, in_fmt, level_name, lut_type, scale, use_rgba):
-    if acceleration == "numba":
-        setConfigOptions(useCupy=False, useNumba=True)
-    elif acceleration == "cupy":
+    if acceleration == "cupy":
         setConfigOptions(useCupy=True, useNumba=False)
     else:
         setConfigOptions(useCupy=False, useNumba=False)