api: silence non-Expr warning for tensor (e.g staggering/name/..)

Author: mloubout

devito/data/allocators.py

@@ -112,7 +112,7 @@ def alloc(self, shape, dtype, padding=0):
             raise RuntimeError(f"Unable to allocate {size} elements in memory")
 
         # Compute the pointer to the user data
-        padleft_bytes = padleft * ctypes.sizeof(ctype)
+        padleft_bytes = int(padleft * ctypes.sizeof(ctype))
         c_pointer = ctypes.c_void_p(padleft_pointer.value + padleft_bytes)
 
         # Cast to 1D array of the specified `datasize`

devito/types/basic.py

@@ -1,5 +1,6 @@
 import abc
 import inspect
+import warnings
 from contextlib import suppress
 from ctypes import POINTER, Structure, _Pointer, c_char, c_char_p
 from functools import cached_property, reduce
@@ -9,6 +10,7 @@
 import sympy
 from sympy.core.assumptions import _assume_rules
 from sympy.core.decorators import call_highest_priority
+from sympy.utilities.exceptions import SymPyDeprecationWarning
 
 from devito.data import default_allocator
 from devito.parameters import configuration
@@ -1533,10 +1535,20 @@ def _sympify(self, arg):
         # This is used internally by sympy to process arguments at rebuilt. And since
         # some of our properties are non-sympyfiable we need to have a fallback
         try:
-            return super()._sympify(arg)
-        except sympy.SympifyError:
+            # Pure sympy object
+            return arg._sympy_()
+        except AttributeError:
             return arg
 
+    @classmethod
+    def _eval_from_dok(cls, rows, cols, dok):
+        with warnings.catch_warnings():
+            warnings.filterwarnings(
+                "ignore",
+                category=SymPyDeprecationWarning
+            )
+            return super()._eval_from_dok(rows, cols, dok)
+
     @property
     def grid(self):
         """

devito/types/dense.py

@@ -1157,6 +1157,8 @@ def __staggered_setup__(cls, dimensions, staggered=None, **kwargs):
             assert len(staggered) == len(dimensions)
             processed = staggered
         else:
+            # Staggering is not NODE or CELL or None
+            # therefore it's a tuple of dimensions
             processed = []
             for d in dimensions:
                 if d in as_tuple(staggered):

devito/types/utils.py

@@ -59,7 +59,9 @@ def on_node(self):
 
     @property
     def _ref(self):
-        if self.on_node:
+        if not self:
+            return None
+        elif self.on_node:
             return NODE
         else:
             return tuple(d for d, s in zip(self.getters, self, strict=True) if s == 1)

tests/test_staggered_utils.py

@@ -3,8 +3,7 @@
 from sympy import simplify
 
 from devito import (
-    CELL, NODE, Dimension, Eq, Function, Grid, Operator, TimeFunction, VectorTimeFunction,
-    div
+    CELL, NODE, Eq, Function, Grid, Operator, TimeFunction, VectorTimeFunction, div
 )
 from devito.tools import as_tuple, powerset
 
@@ -173,16 +172,15 @@ def test_staggered_rebuild(stagg):
     f = Function(name='f', grid=grid, space_order=4, staggered=stagg)
     assert tuple(f.staggered.getters.keys()) == grid.dimensions
 
-    new_dims = (Dimension('x1'), Dimension('y1'), Dimension('z1'))
-    f2 = f.func(dimensions=new_dims)
+    f2 = f.func(name="f2")
 
-    assert f2.dimensions == new_dims
+    assert f2.dimensions == f.dimensions
     assert tuple(f2.staggered) == tuple(f.staggered)
-    assert tuple(f2.staggered.getters.keys()) == new_dims
+    assert tuple(f2.staggered.getters.keys()) == f.dimensions
 
     # Check that rebuild correctly set the staggered indices
     # with the new dimensions
-    for (d, nd) in zip(grid.dimensions, new_dims, strict=True):
+    for (d, nd) in zip(grid.dimensions, f.dimensions, strict=True):
         if d in as_tuple(stagg) or stagg is CELL:
             assert f2.indices[nd] == nd + nd.spacing / 2
         else: