compiler: Fix occurence of NullInterval after rebase

refresh

revert unrelated changes from fix_2235 branch

refresh

Author: George Bisbas

devito/deprecations.py

@@ -6,15 +6,15 @@ class DevitoDeprecation:
 
     @cached_property
     def coeff_warn(self):
-        warn("The Coefficient API is deprecated and will be removed, coefficients should"
-             " be passed directly to the derivative object `u.dx(weights=...)",
+        warn("The Coefficient API is deprecated and will be removed, coefficients should "
+             "be passed directly to the derivative object `u.dx(weights=...)",
              DeprecationWarning, stacklevel=2)
         return
 
     @cached_property
     def symbolic_warn(self):
-        warn("coefficients='symbolic' is deprecated, coefficients should"
-             " be passed directly to the derivative object `u.dx(weights=...)",
+        warn("coefficients='symbolic' is deprecated, coefficients should "
+             "be passed directly to the derivative object `u.dx(weights=...)",
              DeprecationWarning, stacklevel=2)
         return
 

devito/ir/clusters/cluster.py

@@ -476,11 +476,12 @@ def dspace(self):
         # intersecting intervals with matching only dimensions
         for f, v in parts.items():
             for i in v:
-                # oobs check is not required but helps reduce
-                # interval reconstruction
-                if i.dim in oobs and i.dim in f.dimensions:
+                if i.dim in self.ispace and i.dim in f.dimensions:
+                    # oobs check is not required but helps reduce
+                    # interval reconstruction
                     ii = intervals[i.dim].intersection(v[i.dim])
-                    intervals = intervals.set_upper(i.dim, ii.upper)
+                    if not ii.is_Null:
+                        intervals = intervals.set_upper(i.dim, ii.upper)
 
         # E.g., `db0 -> time`, but `xi NOT-> x`
         intervals = intervals.promote(lambda d: not d.is_Sub)

devito/types/dimension.py

@@ -354,8 +354,8 @@ def _arg_check(self, args, size, interval):
                 from devito.symbolics import normalize_args
                 upper = interval.upper.subs(normalize_args(args))
             if args[self.max_name] + upper >= size:
-                raise InvalidArgument("OOB detected due to %s=%d" % (self.max_name,
-                                                                     args[self.max_name]))
+                raise InvalidArgument(f"OOB detected due to "
+                                      f"{self.max_name}={args[self.max_name]}")
 
         # Allow the specific case of max=min-1, which disables the loop
         if args[self.max_name] < args[self.min_name]-1:

examples/userapi/02_apply.ipynb

@@ -143,11 +143,11 @@
        " 'y_m': 0,\n",
        " 'y_size': 4,\n",
        " 'y_M': 3,\n",
-       " 'h_x': 0.33333334,\n",
-       " 'h_y': 0.33333334,\n",
-       " 'o_x': 0.0,\n",
-       " 'o_y': 0.0,\n",
-       " 'timers': <cparam 'P' (0x7f3ce4f15110)>}"
+       " 'h_x': np.float32(0.33333334),\n",
+       " 'h_y': np.float32(0.33333334),\n",
+       " 'o_x': np.float32(0.0),\n",
+       " 'o_y': np.float32(0.0),\n",
+       " 'timers': <cparam 'P' (0x75b734deb6a0)>}"
       ]
      },
      "execution_count": 5,

tests/test_buffering.py

@@ -785,23 +785,3 @@ def test_multi_cond():
 
     for i in range(nt):
         assert np.allclose(f.data[i], i*2)
-
-def test_default_timeM():
-    """
-    MFE for issue #2235
-    """
-    grid = Grid(shape=(4, 4))
-
-    u = TimeFunction(name='u', grid=grid)
-    usave = TimeFunction(name='usave', grid=grid, save=5)
-
-    eqns = [Eq(u.forward, u + 1),
-            Eq(usave, u)]
-
-    op = Operator(eqns)
-
-    assert op.arguments()['time_M'] == 4
-
-    op.apply()
-
-    assert all(np.all(usave.data[i] == i) for i in range(4))

tests/test_operator.py

@@ -2159,11 +2159,6 @@ def test_indirection(self, nt, offset, epass):
         assert op._dspace[time].lower == 0
         assert op._dspace[time].upper == offset
 
-        op()
-
-        assert np.all(f.data[0] == 0.)
-        assert np.all(f.data[i] == 3. for i in range(1, 10))
-
         if epass:
             assert op.arguments()['time_M'] == nt - offset - 1
             op()
@@ -2396,4 +2391,4 @@ def test_to_json(self):
             assert json_object['device'] == summary['device']
 
         # Clean up
-        os.remove("memory_estimate_output.json")
+        os.remove("memory_estimate_output.json")