From 6ff7722e7ff209caf1f678b8b516cec89e6f9983 Mon Sep 17 00:00:00 2001
From: Frederik Hennig <frederik.hennig@fau.de>
Date: Tue, 9 Jul 2024 16:16:33 +0200
Subject: [PATCH] clean up some APIs with respect to pystencils master
---
src/pystencils/__init__.py | 2 +-
src/pystencils/fd/derivation.py | 2 +-
src/pystencils/fd/derivative.py | 2 +-
src/pystencils/fd/finitedifferences.py | 2 +-
src/pystencils/field.py | 4 ++--
src/pystencils/kernel_decorator.py | 2 +-
src/pystencils/simp/simplifications.py | 2 +-
src/pystencils/simp/subexpression_insertion.py | 2 +-
src/pystencils/sympyextensions/__init__.py | 2 ++
9 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/pystencils/__init__.py b/src/pystencils/__init__.py
index ac3801518..81baf7d19 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 f739c8f02..bea0a9674 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 2396fe1a9..c119d1e2e 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 f34a448ed..0c2425d25 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 ac0aa3ae0..2a7b6d315 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 ce0a31d54..a3590d3a4 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 73d80ecd4..9368c8f51 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 0c5aca1dd..33dfbc351 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 0b8b3690d..847a4380b 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"
]
--
GitLab