diff --git a/creationfunctions.py b/creationfunctions.py index a4db6167179180461a607f947bb7fd74cacfb4c4..eb85f66578d9d4ff463f3142a92835713e51da01 100644 --- a/creationfunctions.py +++ b/creationfunctions.py @@ -156,7 +156,7 @@ from lbmpy.methods.creationfunctions import create_generic_mrt from lbmpy.methods.cumulantbased import CumulantBasedLbMethod from pystencils.cache import disk_cache_no_fallback from pystencils.data_types import collate_types -from pystencils.assignment_collection.assignment_collection import AssignmentCollection +from pystencils import AssignmentCollection from pystencils.field import get_layout_of_array, Field from pystencils import create_kernel, Assignment from lbmpy.turbulence_models import add_smagorinsky_model diff --git a/methods/abstractlbmethod.py b/methods/abstractlbmethod.py index 20e7d177d54a78fa73ce1d368f3d6c003933f5ef..c97d695b2e4081f242a1f553e991ed5cd8f634fd 100644 --- a/methods/abstractlbmethod.py +++ b/methods/abstractlbmethod.py @@ -1,7 +1,7 @@ import abc import sympy as sp from collections import namedtuple -from pystencils.assignment_collection import AssignmentCollection +from pystencils import AssignmentCollection RelaxationInfo = namedtuple('RelaxationInfo', ['equilibrium_value', 'relaxation_rate']) diff --git a/methods/conservedquantitycomputation.py b/methods/conservedquantitycomputation.py index f58b69eb9b566f1659ba66c97ccaddae1d3c1597..fd3c87834fe92ccc5b4d0533117929d87f6ee7c6 100644 --- a/methods/conservedquantitycomputation.py +++ b/methods/conservedquantitycomputation.py @@ -1,8 +1,7 @@ import abc import sympy as sp from collections import OrderedDict -from pystencils.assignment_collection import AssignmentCollection -from pystencils import Field, Assignment +from pystencils import Field, Assignment, AssignmentCollection class AbstractConservedQuantityComputation(abc.ABC): diff --git a/phasefield/phasefieldstep.py b/phasefield/phasefieldstep.py index 52a0f13efe6791b4d2aca34c7d62a55aca7542b2..6694c1ba0dcea7e5dde70644917fcf9589f9d4ad 100644 --- a/phasefield/phasefieldstep.py +++ b/phasefield/phasefieldstep.py @@ -11,7 +11,7 @@ from pystencils import create_kernel, create_data_handling from lbmpy.phasefield.analytical import chemical_potentials_from_free_energy, symmetric_tensor_linearization from pystencils.boundaries.boundaryhandling import FlagInterface from pystencils.boundaries.inkernel import add_neumann_boundary -from pystencils.assignment_collection.simplifications import sympy_cse_on_assignment_list +from pystencils.simp import sympy_cse_on_assignment_list from pystencils.slicing import make_slice, SlicedGetter diff --git a/simplificationfactory.py b/simplificationfactory.py index 306ab00cf28f2f53fb085d6b51d5ae1d514142ce..e70895bfd9b6595cef05793db0bed432d92ffc73 100644 --- a/simplificationfactory.py +++ b/simplificationfactory.py @@ -1,12 +1,12 @@ import sympy as sp from lbmpy.innerloopsplit import create_lbm_split_groups from lbmpy.methods.cumulantbased import CumulantBasedLbMethod -from pystencils.assignment_collection.simplifications import apply_to_all_assignments, \ +from pystencils.simp import apply_to_all_assignments, \ subexpression_substitution_in_main_assignments, sympy_cse, add_subexpressions_for_divisions def create_simplification_strategy(lb_method, cse_pdfs=False, cse_global=False, split_inner_loop=False): - from pystencils.assignment_collection import SimplificationStrategy + from pystencils.simp import SimplificationStrategy from lbmpy.methods.momentbased import MomentBasedLbMethod from lbmpy.methods.momentbasedsimplifications import replace_second_order_velocity_products, \ factor_density_after_factoring_relaxation_times, factor_relaxation_rates, cse_in_opposing_directions, \ diff --git a/updatekernels.py b/updatekernels.py index a63d0d115877f9890cc21ab7481a191a162ee1a7..5ee8f782f49ee91031be79d9b3bd93f03acb2511 100644 --- a/updatekernels.py +++ b/updatekernels.py @@ -1,8 +1,7 @@ import numpy as np import sympy as sp -from pystencils import Field, Assignment -from pystencils.assignment_collection.assignment_collection import AssignmentCollection +from pystencils import Field, Assignment, AssignmentCollection from pystencils.field import create_numpy_array_with_layout, layout_string_to_tuple from pystencils.sympyextensions import fast_subs from lbmpy.methods.abstractlbmethod import LbmCollisionRule