Merge pull request #478 from ecmwf-ifs/naml-fix-field-offload

FieldOffload: Allow and skip non-enriched calls in offload region
ecmwf-ifs · Jan 18, 2025 · 7dbdf4c · 7dbdf4c
2 parents 2c0e8bf + 93961de
commit 7dbdf4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/loki/transformations/data_offload/field_offload.py b/loki/transformations/data_offload/field_offload.py
@@ -12,7 +12,7 @@
     nodes as ir, FindNodes, FindVariables, Transformer,
     SubstituteExpressions, pragma_regions_attached, is_loki_pragma
 )
-from loki.logging import warning, error
+from loki.logging import warning
 from loki.types import BasicType
 
 from loki.transformations.field_api import FieldPointerMap
@@ -126,9 +126,9 @@ def find_offload_variables(driver, region, field_group_types):
     # Do some sanity checking and warning for enclosed calls
     for call in FindNodes(ir.CallStatement).visit(region):
         if call.routine is BasicType.DEFERRED:
-            error(f'[Loki] Data offload: Routine {driver.name} has not been enriched ' +
+            warning(f'[Loki] Data offload: Routine {driver.name} has not been enriched ' +
                     f'in {str(call.name).lower()}')
-            raise RuntimeError
+            continue
         for param, arg in call.arg_iter():
             if not isinstance(param, Array):
                 continue

diff --git a/loki/transformations/data_offload/tests/test_field_offload.py b/loki/transformations/data_offload/tests/test_field_offload.py
@@ -367,9 +367,8 @@ def test_field_offload_unknown_kernel(caplog, frontend, state_module, tmp_path):
                                                          offload_index='i',
                                                          field_group_types=['state_type'])
     caplog.clear()
-    with caplog.at_level(log_levels['ERROR']):
-        with pytest.raises(RuntimeError):
-            driver.apply(field_offload_trafo, role='driver', targets=['another_kernel'])
+    with caplog.at_level(log_levels['WARNING']):
+        driver.apply(field_offload_trafo, role='driver', targets=['another_kernel'])
         assert len(caplog.records) == 1
         assert ('[Loki] Data offload: Routine driver_routine has not been enriched '+
                 'in another_kernel') in caplog.records[0].message