From 27603f4198d47d26acf4aee3d4cbbe6e163e5120 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Wed, 25 Apr 2018 15:37:57 +0200
Subject: [PATCH] Renamed assignment_collection submodule to simp (for
simplifications)
---
creationfunctions.py | 2 +-
methods/abstractlbmethod.py | 2 +-
methods/conservedquantitycomputation.py | 3 +--
phasefield/phasefieldstep.py | 2 +-
simplificationfactory.py | 4 ++--
updatekernels.py | 3 +--
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/creationfunctions.py b/creationfunctions.py
index a4db6167..eb85f665 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 20e7d177..c97d695b 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 f58b69eb..fd3c8783 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 52a0f13e..6694c1ba 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 306ab00c..e70895bf 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 a63d0d11..5ee8f782 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
--
GitLab