IR: Adjust imports of utilities across all tests

loki/batch/tests/test_scheduler.py

@@ -66,13 +66,11 @@
     ProcedureBindingItem, InterfaceItem, TypeDefItem, SFilter,
     ExternalItem, Transformation, Pipeline
 )
-from loki.expression import (
-    Scalar, Array, Literal, ProcedureSymbol, FindInlineCalls
-)
+from loki.expression import Scalar, Array, Literal, ProcedureSymbol
 from loki.frontend import (
     available_frontends, OMNI, OFP, FP, REGEX, HAVE_FP, HAVE_OFP, HAVE_OMNI
 )
-from loki.ir import nodes as ir, FindNodes
+from loki.ir import nodes as ir, FindNodes, FindInlineCalls
 from loki.transformations import (
     DependencyTransformation, ModuleWrapTransformation
 )

loki/expression/tests/test_expression.py

@@ -20,14 +20,14 @@
 )
 from loki.backend import cgen, fgen
 from loki.build import jit_compile, clean_test
-from loki.expression import (
-    symbols as sym, FindVariables, FindExpressions, FindInlineCalls,
-    SubstituteExpressions, AttachScopesMapper, parse_expr
-)
+from loki.expression import symbols as sym, parse_expr, AttachScopesMapper
 from loki.frontend import (
     available_frontends, OFP, OMNI, FP, HAVE_FP, parse_fparser_expression
 )
-from loki.ir import nodes as ir, FindNodes
+from loki.ir import (
+    nodes as ir, FindNodes, FindVariables, FindExpressions,
+    FindInlineCalls, SubstituteExpressions
+)
 from loki.tools import (
     filehash, stdchannel_redirected, stdchannel_is_captured
 )

loki/expression/tests/test_parser.py

@@ -11,10 +11,11 @@
 import pymbolic.mapper as pmbl_mapper
 
 from loki import Subroutine, Module, Scope
-from loki.expression import symbols as sym, FindVariables, parse_expr
+from loki.expression import symbols as sym, parse_expr
 from loki.frontend import (
     available_frontends, OMNI, HAVE_FP, parse_fparser_expression
 )
+from loki.ir import FindVariables
 
 
 # utility function to test parse_expr with different case

loki/frontend/tests/test_omni.py

@@ -12,9 +12,8 @@
 import pytest
 
 from loki import Module, Subroutine
-from loki.expression import FindVariables
 from loki.frontend import OMNI, HAVE_OMNI
-from loki.ir import nodes as ir, FindNodes
+from loki.ir import nodes as ir, FindNodes, FindVariables
 
 
 @pytest.mark.skipif(not HAVE_OMNI, reason='Test tequires OMNI frontend.')

loki/ir/tests/test_expr_visitors.py

@@ -8,12 +8,12 @@
 import pytest
 
 from loki import Sourcefile, Subroutine
-from loki.expression import (
-    symbols as sym, parse_expr, FindVariables, FindTypedSymbols,
+from loki.expression import symbols as sym, parse_expr
+from loki.frontend import available_frontends
+from loki.ir import (
+    nodes as ir, FindNodes, FindVariables, FindTypedSymbols,
     SubstituteExpressions, SubstituteStringExpressions
 )
-from loki.frontend import available_frontends
-from loki.ir import nodes as ir, FindNodes
 
 
 @pytest.mark.parametrize('frontend', available_frontends())

loki/ir/tests/test_visitor.py

@@ -16,12 +16,11 @@
 from loki.ir import (
     is_parent_of, is_child_of, FindNodes, FindScopes, Transformer,
     NestedTransformer, MaskedTransformer, NestedMaskedTransformer,
-    Stringifier
+    Stringifier, FindVariables, ExpressionFinder,
+    SubstituteExpressions
 )
 from loki.expression import (
-    symbols as sym, FindVariables, ExpressionFinder,
-    ExpressionCallbackMapper, ExpressionRetriever,
-    SubstituteExpressions
+    symbols as sym, ExpressionCallbackMapper, ExpressionRetriever
 )
 
 

loki/transformations/build_system/tests/test_dependency.py

@@ -9,9 +9,10 @@
 
 from loki import Sourcefile
 from loki.batch import Scheduler, SchedulerConfig
-from loki.expression import FindInlineCalls
 from loki.frontend import available_frontends, OMNI, OFP
-from loki.ir import FindNodes, CallStatement, Import, Interface, Intrinsic
+from loki.ir import (
+    FindNodes, CallStatement, Import, Interface, Intrinsic, FindInlineCalls
+)
 
 from loki.transformations import (
     DependencyTransformation, ModuleWrapTransformation

loki/transformations/tests/test_array_indexing.py

@@ -11,9 +11,9 @@
 
 from loki import Module, Subroutine, fgen
 from loki.build import jit_compile, jit_compile_lib, clean_test, Builder, Obj
-from loki.expression import symbols as sym, FindVariables
+from loki.expression import symbols as sym
 from loki.frontend import available_frontends, OMNI
-from loki.ir import FindNodes, CallStatement, Loop
+from loki.ir import FindNodes, CallStatement, Loop, FindVariables
 
 from loki.transformations.array_indexing import (
     promote_variables, demote_variables, invert_array_indices,

loki/transformations/tests/test_extract.py

@@ -7,9 +7,8 @@
 
 import pytest
 
-from loki.expression import FindInlineCalls
 from loki.frontend import available_frontends, OMNI, OFP
-from loki.ir import CallStatement, Import, FindNodes
+from loki.ir import CallStatement, Import, FindNodes, FindInlineCalls
 from loki.sourcefile import Sourcefile
 from loki.subroutine import Subroutine
 

loki/transformations/tests/test_pool_allocator.py

@@ -9,13 +9,11 @@
 
 from loki import Dimension
 from loki.batch import Scheduler, SchedulerConfig
-from loki.expression import (
-    FindVariables, FindInlineCalls, InlineCall, simplify
-)
+from loki.expression import InlineCall, simplify
 from loki.frontend import available_frontends, OMNI, FP, OFP
 from loki.ir import (
     FindNodes, CallStatement, Assignment, Allocation, Deallocation,
-    Loop, Pragma, get_pragma_parameters
+    Loop, Pragma, get_pragma_parameters, FindVariables, FindInlineCalls
 )
 
 from loki.transformations.pool_allocator import TemporariesPoolAllocatorTransformation

loki/transformations/tests/test_scc_cuf.py

@@ -9,11 +9,11 @@
 import pytest
 
 from loki import Scheduler, Subroutine, Dimension
-from loki.expression import symbols as sym, FindVariables
+from loki.expression import symbols as sym
 from loki.frontend import available_frontends
 from loki.ir import (
-    FindNodes, Loop, Assignment, CallStatement, Allocation,
-    Deallocation, VariableDeclaration, Import, Pragma
+    FindNodes, FindVariables, Loop, Assignment, CallStatement,
+    Allocation, Deallocation, VariableDeclaration, Import, Pragma
 )
 
 from loki.transformations.parametrise import ParametriseTransformation

loki/transformations/tests/test_split_read_write.py

@@ -7,9 +7,11 @@
 
 import pytest
 
-from loki.expression import FindVariables
 from loki import Dimension, Subroutine
-from loki.ir import FindNodes, nodes as ir, pragma_regions_attached, is_loki_pragma
+from loki.ir import (
+    nodes as ir, FindNodes, FindVariables, pragma_regions_attached,
+    is_loki_pragma
+)
 from loki.frontend import available_frontends
 from loki.transformations import SplitReadWriteTransformation
 

loki/transformations/tests/test_transform_derived_types.py

@@ -13,9 +13,11 @@
     Sourcefile, Scheduler, ProcedureItem, as_tuple,
     ProcedureDeclaration, BasicType, CaseInsensitiveDict,
 )
-from loki.expression import Scalar, Array, FindVariables, FindInlineCalls
+from loki.expression import Scalar, Array
 from loki.frontend import available_frontends, OMNI
-from loki.ir import FindNodes, CallStatement
+from loki.ir import (
+    FindNodes, FindVariables, FindInlineCalls, CallStatement
+)
 
 from loki.transformations.transform_derived_types import (
     DerivedTypeArgumentsTransformation,

loki/transformations/tests/test_utilities.py

@@ -8,11 +8,12 @@
 import pytest
 
 from loki import Module, Subroutine, Dimension, fgen
-from loki.expression import (
-    symbols as sym, FindVariables, FindInlineCalls, SubstituteExpressions
-)
+from loki.expression import symbols as sym
 from loki.frontend import available_frontends, OMNI
-from loki.ir import nodes as ir, FindNodes, pragmas_attached
+from loki.ir import (
+    nodes as ir, FindNodes, FindVariables, FindInlineCalls,
+    SubstituteExpressions, pragmas_attached
+)
 from loki.types import BasicType
 
 from loki.transformations.utilities import (