Merge pull request #643 from qiboteam/cumulative

Remove numba from cumulative

pyproject.toml

@@ -43,7 +43,6 @@ skl2onnx = { version = "^1.14.0", optional = true }
 onnxruntime = { version = "^1.14.1", optional = true }
 onnx = { version = "^1.13.1", optional = true }
 pyyaml = "^6.0"
-numba = "^0.57.1"
 
 
 [tool.poetry.group.test]
@@ -106,7 +105,6 @@ test-docs = "make -C doc doctest"
 [tool.pytest.ini_options]
 testpaths = ['tests/']
 addopts = ['--cov=qibocal', '--cov-report=xml', '--cov-report=html']
-env = ["D:NUMBA_DISABLE_JIT=1"]
 
 [tool.pylint.master]
 # extensions not to check

src/qibocal/protocols/characterization/utils.py

@@ -6,7 +6,6 @@
 import numpy.typing as npt
 import pandas as pd
 import plotly.graph_objects as go
-from numba import njit
 from plotly.subplots import make_subplots
 from qibolab.qubits import QubitId
 from scipy import constants
@@ -244,23 +243,11 @@ def norm(x_mags):
     return (x_mags - np.min(x_mags)) / (np.max(x_mags) - np.min(x_mags))
 
 
-@njit(["float64[:] (float64[:], float64[:])"], parallel=True, cache=True)
 def cumulative(input_data, points):
     r"""Evaluates in data the cumulative distribution
     function of `points`.
-    WARNING: `input_data` and `points` should be sorted data.
     """
-    input_data = np.sort(input_data)
-    points = np.sort(points)
-    # data and points sorted
-    prob = []
-    app = 0
-
-    for val in input_data:
-        app += np.maximum(np.searchsorted(points[app::], val), 0)
-        prob.append(float(app))
-
-    return np.array(prob)
+    return np.searchsorted(np.sort(points), np.sort(input_data))
 
 
 def fit_punchout(data: Data, fit_type: str):