Merge pull request #157 from ecmwf-ifs/nabr_fix_scc_cuf

Fix cudafor import in driver for SCC CUF

transformations/tests/test_scc_cuf.py

@@ -60,6 +60,9 @@ def fixture_config():
 
 
 def check_subroutine_driver(routine, blocking, disable=()):
+    # use of "use cudafor"
+    imports = [_import.module.lower() for _import in FindNodes(Import).visit(routine.spec)]
+    assert "cudafor" in imports
     # device arrays
     # device arrays: declaration
     arrays = [var for var in routine.variables if isinstance(var, sym.Array)]

transformations/transformations/scc_cuf.py

@@ -671,13 +671,6 @@ def __init__(self, horizontal, vertical, block_dim, transformation_type='paramet
             self.derived_types = [_.upper() for _ in derived_types]
         self.derived_type_variables = ()
 
-    def transform_module(self, module, **kwargs):
-
-        role = kwargs.get('role')
-
-        if role == 'driver':
-            module.spec.prepend(ir.Import(module="cudafor"))
-
     def transform_subroutine(self, routine, **kwargs):
 
         item = kwargs.get('item', None)
@@ -696,8 +689,7 @@ def transform_subroutine(self, routine, **kwargs):
         single_variable_declaration(routine=routine, group_by_shape=True)
         device_subroutine_prefix(routine, depth)
 
-        if depth > 0:
-            routine.spec.prepend(ir.Import(module="cudafor"))
+        routine.spec.prepend(ir.Import(module="cudafor"))
 
         if role == 'driver':
             self.process_routine_driver(routine, targets=targets)