Renamed assignment_collection submodule to simp (for simplifications)

__init__.py

@@ -5,11 +5,11 @@ from .data_types import TypedSymbol
 from .slicing import make_slice
 from .kernelcreation import create_kernel, create_indexed_kernel
 from .display_utils import show_code, to_dot
-from .assignment_collection import AssignmentCollection
+from .simp import AssignmentCollection
 from .assignment import Assignment
 from .sympyextensions import SymbolCreator
 from .datahandling import create_data_handling
-from . kernel_decorator import kernel
+from .kernel_decorator import kernel
 
 __all__ = ['Field', 'FieldType', 'fields',
            'TypedSymbol',
@@ -21,3 +21,4 @@ __all__ = ['Field', 'FieldType', 'fields',
            'SymbolCreator',
            'create_data_handling',
            'kernel']
+

fd/finitedifferences.py

@@ -2,10 +2,9 @@ import numpy as np
 import sympy as sp
 from typing import Union, Optional
 
-from pystencils.assignment_collection import AssignmentCollection
-from pystencils.field import Field
+from pystencils import Field, AssignmentCollection
+from pystencils.fd import Diff
 from pystencils.sympyextensions import fast_subs
-from pystencils.fd.derivative import Diff
 
 
 FieldOrFieldAccess = Union[Field, Field.Access]

kernelcreation.py

 from types import MappingProxyType
 import sympy as sp
-from pystencils.assignment import Assignment
-from pystencils.astnodes import LoopOverCoordinate, Conditional, Block, SympyAssignment
-from pystencils.assignment_collection import AssignmentCollection
-from pystencils.gpucuda.indexing import indexing_creator_from_params
-from pystencils.transformations import remove_conditionals_in_staggered_kernel
+from .assignment import Assignment
+from .astnodes import LoopOverCoordinate, Conditional, Block, SympyAssignment
+from .simp.assignment_collection import AssignmentCollection
+from .gpucuda.indexing import indexing_creator_from_params
+from .transformations import remove_conditionals_in_staggered_kernel
 
 
 def create_kernel(assignments, target='cpu', data_type="double", iteration_slice=None, ghost_layers=None,

assignment_collection/__init__.py → simp/__init__.py

-from pystencils.assignment_collection.assignment_collection import AssignmentCollection
-from pystencils.assignment_collection.simplificationstrategy import SimplificationStrategy
-from pystencils.assignment_collection.simplifications import sympy_cse, sympy_cse_on_assignment_list, \
+from .assignment_collection import AssignmentCollection
+from .simplificationstrategy import SimplificationStrategy
+from .simplifications import sympy_cse, sympy_cse_on_assignment_list, \
     apply_to_all_assignments, apply_on_all_subexpressions, subexpression_substitution_in_existing_subexpressions, \
     subexpression_substitution_in_main_assignments, add_subexpressions_for_divisions
 

assignment_collection/simplifications.py → simp/simplifications.py

 import sympy as sp
 from typing import Callable, List
 from pystencils.assignment import Assignment
-from pystencils.assignment_collection.assignment_collection import AssignmentCollection
+from pystencils.simp.assignment_collection import AssignmentCollection
 from pystencils.sympyextensions import subs_additive
 
 AC = AssignmentCollection

assignment_collection/simplificationstrategy.py → simp/simplificationstrategy.py

 import sympy as sp
 from collections import namedtuple
 from typing import Callable, Any, Optional, Sequence
-from pystencils.assignment_collection.assignment_collection import AssignmentCollection
+from pystencils.simp.assignment_collection import AssignmentCollection
 
 
 class SimplificationStrategy: