Rebase cleanup

ecmwf-ifs · May 10, 2024 · 4d4f6ee · 4d4f6ee
1 parent 3a83b83
commit 4d4f6ee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/loki/transformations/__init__.py b/loki/transformations/__init__.py
@@ -23,4 +23,4 @@
 from loki.transformations.transform_region import * # noqa
 from loki.transformations.pool_allocator import * # noqa
 from loki.transformations.utilities import * # noqa
-from transformations.block_index_transformations import * # noqa
+from loki.transformations.block_index_transformations import * # noqa
diff --git a/loki/transformations/block_index_transformations.py b/loki/transformations/block_index_transformations.py
@@ -7,11 +7,12 @@
 
 from loki import (
     Transformation, ProcedureItem, ir, Module, as_tuple, SymbolAttributes, BasicType, Variable,
-    RangeIndex, Array, FindVariables, resolve_associates, SubstituteExpressions, FindNodes,
-    recursive_expression_map_update
+    RangeIndex, Array, FindVariables, SubstituteExpressions, FindNodes
 )
 
-from transformations.single_column_coalesced import SCCBaseTransformation
+from loki.transformations.sanitise import resolve_associates
+from loki.transformations.utilities import recursive_expression_map_update
+from loki.transformations.single_column.base import SCCBaseTransformation
 
 __all__ = ['BlockViewToFieldViewTransformation', 'BlockIndexInjectTransformation']
 

diff --git a/loki/transformations/tests/test_block_index_inject.py b/loki/transformations/tests/test_block_index_inject.py
@@ -10,10 +10,9 @@
 
 from loki import (
     Dimension, gettempdir, Scheduler, OMNI, FindNodes, Assignment, FindVariables, CallStatement, Subroutine,
-    Item
+    Item, available_frontends
 )
-from conftest import available_frontends
-from transformations import BlockViewToFieldViewTransformation, BlockIndexInjectTransformation
+from loki.transformations import BlockViewToFieldViewTransformation, BlockIndexInjectTransformation
 
 @pytest.fixture(scope='module', name='horizontal')
 def fixture_horizontal():