compiler: fix division printing

Author: mloubout

.github/workflows/pytest-core-nompi.yml

@@ -172,7 +172,7 @@ jobs:
 
     - name: Test with pytest
       run: |
-        ${{ env.RUN_CMD }} pytest -k "${{ matrix.test-set }}" -m "not parallel" --cov --cov-config=.coveragerc --cov-report=xml ${{ env.TESTS }}
+        ${{ env.RUN_CMD }} pytest -k "${{ matrix.test-set }}" -m "not parallel" --cov --cov-config=.coveragerc --cov-report=xml tests/
 
     - name: Upload coverage to Codecov
       if: "!contains(matrix.name, 'docker')"

devito/finite_differences/differentiable.py

@@ -17,7 +17,7 @@
 from devito.finite_differences.tools import make_shift_x0, coeff_priority
 from devito.logger import warning
 from devito.tools import (as_tuple, filter_ordered, flatten, frozendict,
-                          infer_dtype, is_integer, split)
+                          infer_dtype, is_integer, split, is_number)
 from devito.types import Array, DimensionTuple, Evaluable, StencilDimension
 from devito.types.basic import AbstractFunction
 
@@ -549,8 +549,7 @@ def __new__(cls, *args, **kwargs):
         args = flatten(e.args for e in nested) + list(others)
 
         # Gather all numbers and simplify
-        nums, others = split(args, lambda e: isinstance(e, (int, float,
-                                                            sympy.Number, np.number)))
+        nums, others = split(args, lambda e: is_number(e))
         scalar = sympy.Mul(*nums)
 
         # a*0 -> 0

devito/symbolics/extended_sympy.py

@@ -622,6 +622,10 @@ def __new__(cls, name, arguments=None, template=None, **kwargs):
 
         return obj
 
+    def _eval_is_commutative(self):
+        # DefFunction defaults to commutative
+        return True
+
     @property
     def name(self):
         return self._name

devito/tools/utils.py

@@ -12,7 +12,7 @@
            'roundm', 'powerset', 'invert', 'flatten', 'single_or', 'filter_ordered',
            'as_mapper', 'filter_sorted', 'pprint', 'sweep', 'all_equal', 'as_list',
            'indices_to_slices', 'indices_to_sections', 'transitive_closure',
-           'humanbytes', 'contains_val', 'sorted_priority', 'as_set']
+           'humanbytes', 'contains_val', 'sorted_priority', 'as_set', 'is_number']
 
 
 def prod(iterable, initial=1):
@@ -82,6 +82,13 @@ def is_integer(value):
     return isinstance(value, (int, np.integer, sympy.Integer))
 
 
+def is_number(value):
+    """
+    A thorough instance comparison for all number types.
+    """
+    return isinstance(value, (int, float, np.number, sympy.Number))
+
+
 def contains_val(val, items):
     try:
         return val in items

tests/test_dse.py

@@ -88,7 +88,7 @@ def test_pow_to_mul(expr, expected):
 
 
 @pytest.mark.parametrize('expr,expected', [
-    ('s - SizeOf("int")*fa[x]', 's - fa[x]*sizeof(int)'),
+    ('s - SizeOf("int")*fa[x]', 's - sizeof(int)*fa[x]'),
     ('foo(4*fa[x] + 4*fb[x])', 'foo(4*(fa[x] + fb[x]))'),
     ('floor(0.1*a + 0.1*fa[x])', 'floor(0.1*(a + fa[x]))'),
     ('floor(0.1*(a + fa[x]))', 'floor(0.1*(a + fa[x]))'),

tests/test_symbolics.py

@@ -14,7 +14,7 @@
                               CallFromPointer, Cast, DefFunction, FieldFromPointer,
                               INT, FieldFromComposite, IntDiv, Namespace, Rvalue,
                               ReservedWord, ListInitializer, uxreplace, pow_to_mul,
-                              retrieve_derivatives, BaseCast)
+                              retrieve_derivatives, BaseCast, SizeOf)
 from devito.tools import as_tuple
 from devito.types import (Array, Bundle, FIndexed, LocalObject, Object,
                           ComponentAccess, StencilDimension, Symbol as dSymbol)
@@ -877,7 +877,6 @@ def test_assumptions(self, op, expr, assumptions, expected):
 
 
 def test_issue_2577a():
-
     u = TimeFunction(name='u', grid=Grid((2,)))
     x = u.grid.dimensions[0]
     expr = Mul(-1, -1., x, u)
@@ -906,3 +905,10 @@ def define(self, dimensions):
 
     op = Operator(eq_u)
     assert '--' not in str(op.ccode)
+
+
+def test_print_div():
+    a = SizeOf(np.int32)
+    b = SizeOf(np.int64)
+    cstr = ccode(a / b)
+    assert cstr == 'sizeof(int)/sizeof(long)'