move c-intdiv implementations to pystencils.utils

src/pystencils/backend/ast/expressions.py

@@ -636,7 +636,7 @@ class PsIntDiv(PsBinOp, PsIntOpTrait):
 
     @property
     def python_operator(self) -> Callable[[Any, Any], Any]:
-        from .util import c_intdiv
+        from ...utils import c_intdiv
 
         return c_intdiv
 
@@ -646,7 +646,7 @@ class PsRem(PsBinOp, PsIntOpTrait):
 
     @property
     def python_operator(self) -> Callable[[Any, Any], Any]:
-        from .util import c_rem
+        from ...utils import c_rem
 
         return c_rem
 

src/pystencils/backend/ast/util.py

@@ -36,14 +36,3 @@ class AstEqWrapper:
         #   TODO: consider replacing this with smth. more performant
         #   TODO: Check that repr is implemented by all AST nodes
         return hash(repr(self._node))
-
-
-def c_intdiv(num, denom):
-    """C-style integer division"""
-    return int(num / denom)
-
-
-def c_rem(num, denom):
-    """C-style integer remainder"""
-    div = c_intdiv(num, denom)
-    return num - div * denom

src/pystencils/backend/transformations/eliminate_constants.py

@@ -316,7 +316,7 @@ class EliminateConstants:
                                 )
                             elif isinstance(expr, PsDiv):
                                 if is_int:
-                                    from ..ast.util import c_intdiv
+                                    from ...utils import c_intdiv
                                     folded = PsConstant(c_intdiv(v1, v2), dtype)
                                 elif isinstance(dtype, PsIeeeFloatType):
                                     folded = PsConstant(v1 / v2, dtype)

src/pystencils/sympyextensions/integer_functions.py

@@ -48,15 +48,16 @@ class int_div(IntegerFunctionTwoArgsMixIn):
     """C-style round-to-zero integer division"""
     
     def _eval_op(self, arg1, arg2):
-        return int(arg1 / arg2)
+        from ..utils import c_intdiv
+        return c_intdiv(arg1, arg2)
 
 
 class int_rem(IntegerFunctionTwoArgsMixIn):
     """C-style round-to-zero integer remainder"""
     
     def _eval_op(self, arg1, arg2):
-        div = int(arg1 / arg2)
-        return arg1 - div * arg2
+        from ..utils import c_rem
+        return c_rem(arg1, arg2)
 
 
 # noinspection PyPep8Naming

src/pystencils/utils.py

@@ -250,3 +250,14 @@ class ContextVar:
 
     def get(self):
         return self.stack[-1]
+
+
+def c_intdiv(num, denom):
+    """C-style integer division"""
+    return int(num / denom)
+
+
+def c_rem(num, denom):
+    """C-style integer remainder"""
+    div = c_intdiv(num, denom)
+    return num - div * denom