Numba does not output numpy scalars

Author: ricardoV94

tests/scalar/test_basic.py

@@ -6,6 +6,7 @@
 from pytensor.compile.mode import Mode
 from pytensor.graph.fg import FunctionGraph
 from pytensor.link.c.basic import DualLinker
+from pytensor.link.numba import NumbaLinker
 from pytensor.scalar.basic import (
     EQ,
     ComplexError,
@@ -368,7 +369,9 @@ def _test_unary(unary_op, x_range):
             outi = fi(x_val)
             outf = ff(x_val)
 
-            assert outi.dtype == outf.dtype, "incorrect dtype"
+            if not isinstance(ff.maker.linker, NumbaLinker):
+                # Numba doesn't return numpy scalars
+                assert outi.dtype == outf.dtype, "incorrect dtype"
             assert np.allclose(outi, outf), "insufficient precision"
 
     @staticmethod
@@ -389,7 +392,9 @@ def _test_binary(binary_op, x_range, y_range):
                 outi = fi(x_val, y_val)
                 outf = ff(x_val, y_val)
 
-                assert outi.dtype == outf.dtype, "incorrect dtype"
+                if not isinstance(ff.maker.linker, NumbaLinker):
+                    # Numba doesn't return numpy scalars
+                    assert outi.dtype == outf.dtype, "incorrect dtype"
                 assert np.allclose(outi, outf), "insufficient precision"
 
     def test_true_div(self):
@@ -414,7 +419,9 @@ def test_true_div(self):
                 outi = fi(x_val, y_val)
                 outf = ff(x_val, y_val)
 
-                assert outi.dtype == outf.dtype, "incorrect dtype"
+                if not isinstance(ff.maker.linker, NumbaLinker):
+                    # Numba doesn't return numpy scalars
+                    assert outi.dtype == outf.dtype, "incorrect dtype"
                 assert np.allclose(outi, outf), "insufficient precision"
 
     def test_unary(self):

tests/tensor/test_basic.py

@@ -18,6 +18,7 @@
 from pytensor.graph.basic import Apply, equal_computations
 from pytensor.graph.op import Op
 from pytensor.graph.replace import clone_replace
+from pytensor.link.numba import NumbaLinker
 from pytensor.raise_op import Assert
 from pytensor.scalar import autocast_float, autocast_float_as
 from pytensor.tensor import NoneConst, vectorize
@@ -2191,24 +2192,29 @@ def test_ScalarFromTensor(cast_policy):
         assert ss.owner.op is scalar_from_tensor
         assert ss.type.dtype == tc.type.dtype
 
-        v = eval_outputs([ss])
+        mode = get_default_mode()
+        v = eval_outputs([ss], mode=mode)
 
         assert v == 56
-        assert v.shape == ()
-
-        if cast_policy == "custom":
-            assert isinstance(v, np.int8)
-        elif cast_policy == "numpy+floatX":
-            assert isinstance(v, np.int64)
+        assert isinstance(v, int)
+        if not isinstance(mode.linker, NumbaLinker):
+            # Numba doesn't return numpy scalars
+            assert v.shape == ()
+            if cast_policy == "custom":
+                assert isinstance(v, np.int8)
+            elif cast_policy == "numpy+floatX":
+                assert isinstance(v, np.int64)
 
         pts = lscalar()
         ss = scalar_from_tensor(pts)
         ss.owner.op.grad([pts], [ss])
         fff = function([pts], ss)
         v = fff(np.asarray(5))
         assert v == 5
-        assert isinstance(v, np.int64)
-        assert v.shape == ()
+        assert isinstance(v, int)
+        if not isinstance(mode.linker, NumbaLinker):
+            assert isinstance(v, np.int64)
+            assert v.shape == ()
 
         with pytest.raises(TypeError):
             scalar_from_tensor(vector())

tests/unittest_tools.py

@@ -259,7 +259,7 @@ def _compile_and_check(
         numeric_outputs = outputs_function(*numeric_inputs)
         numeric_shapes = shapes_function(*numeric_inputs)
         for out, shape in zip(numeric_outputs, numeric_shapes, strict=True):
-            assert np.all(out.shape == shape), (out.shape, shape)
+            assert np.all(np.asarray(out).shape == shape), (out.shape, shape)
 
 
 class WrongValue(Exception):