diff --git a/src/pystencils/backend/kernelcreation/freeze.py b/src/pystencils/backend/kernelcreation/freeze.py index 0d1ce72e1db5b958e9765b80b2d711108f4001dd..7316e2f9f64c90c92bbc1cf7cd4de6cb3c0676c7 100644 --- a/src/pystencils/backend/kernelcreation/freeze.py +++ b/src/pystencils/backend/kernelcreation/freeze.py @@ -62,11 +62,10 @@ from ..ast.vector import PsVecMemAcc from ..constants import PsConstant from ...types import PsNumericType, PsStructType, PsType from ..exceptions import PsInputError -from ..functions import PsMathFunction, MathFunctions +from ..functions import PsMathFunction, MathFunctions, NumericLimitsFunctions from ..exceptions import FreezeError -import backend.functions -from codegen.properties import ReductionSymbolProperty +from ...codegen.properties import ReductionSymbolProperty ExprLike = ( @@ -207,10 +206,10 @@ class FreezeExpressions: # TODO: unsure if sp.Min & sp.Max are mapped by map_Min/map_Max afterwards case "min": op = sp.Min - init_val = backend.functions.NumericLimitsFunctions("min") + init_val = NumericLimitsFunctions("min") case "max": op = sp.Max - init_val = backend.functions.NumericLimitsFunctions("max") + init_val = NumericLimitsFunctions("max") case _: raise FreezeError(f"Unsupported reduced assignment: {expr.op}.") diff --git a/src/pystencils/codegen/properties.py b/src/pystencils/codegen/properties.py index 5578d24084b24bd4957649391c9552d8c51557ee..cc4ff4101e9762b7bce6750eed3fef1bdc8151a9 100644 --- a/src/pystencils/codegen/properties.py +++ b/src/pystencils/codegen/properties.py @@ -3,7 +3,7 @@ from dataclasses import dataclass from ..field import Field -from backend.ast.expressions import PsExpression +from ..backend.ast.expressions import PsExpression @dataclass(frozen=True) diff --git a/src/pystencils/sympyextensions/__init__.py b/src/pystencils/sympyextensions/__init__.py index 6ab24e936a2355782755badbf835d7e5c3bee73e..7431416c9eb9bcd4433dab76c32fb1b755501105 100644 --- a/src/pystencils/sympyextensions/__init__.py +++ b/src/pystencils/sympyextensions/__init__.py @@ -1,7 +1,6 @@ from .astnodes import ConditionalFieldAccess from .typed_sympy import TypedSymbol, CastFunc from .pointers import mem_acc -from .reduction import reduced_assign from .math import ( prod, @@ -34,7 +33,6 @@ from .math import ( __all__ = [ "ConditionalFieldAccess", - "reduced_assign", "TypedSymbol", "CastFunc", "mem_acc",