diff --git a/src/pystencils/__init__.py b/src/pystencils/__init__.py index ac3801518fbe6a0e2db9b901eeee4013698c0f70..81baf7d199b7147969b0a6f17cc4a06157c91bb7 100644 --- a/src/pystencils/__init__.py +++ b/src/pystencils/__init__.py @@ -31,7 +31,7 @@ from .spatial_coordinates import ( from .assignment import Assignment, AddAugmentedAssignment, assignment_from_stencil from .simp import AssignmentCollection from .sympyextensions.typed_sympy import TypedSymbol -from .sympyextensions.math import SymbolCreator +from .sympyextensions import SymbolCreator from .datahandling import create_data_handling diff --git a/src/pystencils/fd/derivation.py b/src/pystencils/fd/derivation.py index f739c8f020404c29101e27d08c016e789baee93f..bea0a9674086f8f353c52f228397a209ed701131 100644 --- a/src/pystencils/fd/derivation.py +++ b/src/pystencils/fd/derivation.py @@ -6,7 +6,7 @@ import sympy as sp from pystencils.field import Field from pystencils.stencil import direction_string_to_offset -from pystencils.sympyextensions.math import multidimensional_sum, prod +from pystencils.sympyextensions import multidimensional_sum, prod from pystencils.utils import LinearEquationSystem, fully_contains diff --git a/src/pystencils/fd/derivative.py b/src/pystencils/fd/derivative.py index 2396fe1a988acdfa39420d75ffd0557c97fd15fd..c119d1e2ec34c32c67f18f7837c43dee05cfc65b 100644 --- a/src/pystencils/fd/derivative.py +++ b/src/pystencils/fd/derivative.py @@ -3,7 +3,7 @@ from collections import defaultdict, namedtuple import sympy as sp from pystencils.field import Field -from pystencils.sympyextensions.math import normalize_product, prod +from pystencils.sympyextensions import normalize_product, prod def _default_diff_sort_key(d): diff --git a/src/pystencils/fd/finitedifferences.py b/src/pystencils/fd/finitedifferences.py index f34a448ed8401a9b4d7e9f145c4883203f4d1ca9..0c2425d25095b29ccbfb5387490a4353e677f7e1 100644 --- a/src/pystencils/fd/finitedifferences.py +++ b/src/pystencils/fd/finitedifferences.py @@ -8,7 +8,7 @@ from pystencils.fd.derivative import diff_args from pystencils.fd.spatial import fd_stencils_standard from pystencils.field import Field from pystencils.simp import AssignmentCollection -from pystencils.sympyextensions.math import fast_subs +from pystencils.sympyextensions import fast_subs FieldOrFieldAccess = Union[Field, Field.Access] diff --git a/src/pystencils/field.py b/src/pystencils/field.py index ac0aa3ae0c639ad1ace6d7827933ea7a1c9e52d3..2a7b6d3154174d1844597e69785835a3cbce17dd 100644 --- a/src/pystencils/field.py +++ b/src/pystencils/field.py @@ -15,8 +15,8 @@ from pystencils.alignedarray import aligned_empty from pystencils.spatial_coordinates import x_staggered_vector, x_vector from pystencils.stencil import direction_string_to_offset, inverse_direction, offset_to_direction_string from pystencils.types import PsType, PsStructType, create_type -from pystencils.sympyextensions.typed_sympy import (FieldShapeSymbol, FieldStrideSymbol, TypedSymbol) -from pystencils.sympyextensions.math import is_integer_sequence +from pystencils.sympyextensions.typed_sympy import FieldShapeSymbol, FieldStrideSymbol, TypedSymbol +from pystencils.sympyextensions import is_integer_sequence from pystencils.types import UserTypeSpec diff --git a/src/pystencils/kernel_decorator.py b/src/pystencils/kernel_decorator.py index ce0a31d546acf30a418bbc0b2554a2f932a9e180..a3590d3a4bdcddb43aba31ddf943206ba7e47f84 100644 --- a/src/pystencils/kernel_decorator.py +++ b/src/pystencils/kernel_decorator.py @@ -6,7 +6,7 @@ from typing import Callable, Union, List, Dict, Tuple import sympy as sp from .assignment import Assignment -from .sympyextensions.math import SymbolCreator +from .sympyextensions import SymbolCreator from pystencils.config import CreateKernelConfig __all__ = ['kernel', 'kernel_config'] diff --git a/src/pystencils/simp/simplifications.py b/src/pystencils/simp/simplifications.py index 73d80ecd4524a4e2e3890b3c62c8d7307373b29a..9368c8f51a4aabd03c15a0741db5930eb8865884 100644 --- a/src/pystencils/simp/simplifications.py +++ b/src/pystencils/simp/simplifications.py @@ -5,7 +5,7 @@ from collections import defaultdict import sympy as sp from ..assignment import Assignment -from ..sympyextensions.math import subs_additive, is_constant, recursive_collect +from ..sympyextensions import subs_additive, is_constant, recursive_collect from ..sympyextensions.typed_sympy import TypedSymbol diff --git a/src/pystencils/simp/subexpression_insertion.py b/src/pystencils/simp/subexpression_insertion.py index 0c5aca1ddde2c4f5384fbfb004cada3c5397e92b..33dfbc351b1f766d63ce867c860bbabaf56fa187 100644 --- a/src/pystencils/simp/subexpression_insertion.py +++ b/src/pystencils/simp/subexpression_insertion.py @@ -1,5 +1,5 @@ import sympy as sp -from ..sympyextensions.math import is_constant +from ..sympyextensions import is_constant # Subexpression Insertion diff --git a/src/pystencils/sympyextensions/__init__.py b/src/pystencils/sympyextensions/__init__.py index 0b8b3690d59a74342dc8510fba531928c7625539..847a4380b2ccdbac11c3142d19f3db476ee7880b 100644 --- a/src/pystencils/sympyextensions/__init__.py +++ b/src/pystencils/sympyextensions/__init__.py @@ -26,6 +26,7 @@ from .math import ( count_operations_in_ast, common_denominator, get_symmetric_part, + SymbolCreator ) @@ -58,4 +59,5 @@ __all__ = [ "count_operations_in_ast", "common_denominator", "get_symmetric_part", + "SymbolCreator" ]