Merge pull request #83 from EconForge/albop/numba_fix

Albop/numba fix

Author: albop

interpolation/splines/eval_splines.py

@@ -39,8 +39,11 @@
     dAd[:,i] = Ad[:,i-1]*(4-i)
 
 array_2d = numba.typeof(np.zeros((2,2)))
+tt = np.zeros((2,2))
+tt.flags.writeable=False
+array_2d_readonly = numba.typeof(tt)
 array_1d = numba.typeof(np.zeros(2))
-
+del tt
 
 ### eval spline (main function)
 
@@ -105,7 +108,7 @@ def ugly_workaround(grid, C, points, out=None, order=1, diff="None", extrap_mode
     extrap_ = (extrap_mode).literal_value
     d = len(grid)
 
-    vectorized = points == array_2d
+    vectorized = (points == array_2d) or (points == array_2d_readonly)
     allocate = True
     vector_valued = (C.ndim==(len(grid)+1))
 

interpolation/splines/tests/test_readonly.py

@@ -0,0 +1,35 @@
+
+def test_readonly_vec():
+
+    import numpy as np
+    from interpolation.splines.eval_splines import eval_cubic
+
+    vals = np.random.random((7,7,2))
+    grid = ((-0.053333333333333344, 0.053333333333333344, 5), (5.0, 15.0, 5))
+
+    # this works
+    points = np.array([[0., 9.35497829]])
+    x = eval_cubic(grid, vals, points)
+
+    # 
+    pp = points.copy()
+    pp.flags.writeable = False
+    x = eval_cubic(grid, vals, pp)
+
+
+def test_readonly():
+    
+    import numpy as np
+    from interpolation.splines.eval_splines import eval_cubic
+
+    vals = np.random.random((7,7,2))
+    grid = ((-0.053333333333333344, 0.053333333333333344, 5), (5.0, 15.0, 5))
+
+    # this works
+    points = np.array([0., 9.35497829])
+    x = eval_cubic(grid, vals, points)
+
+    # 
+    pp = points.copy()
+    pp.flags.writeable = False
+    x = eval_cubic(grid, vals, pp)