Merge branch 'develop' into docu_breaking_changes

Author: twicki

.github/PULL_REQUEST_TEMPLATE/release.md

@@ -25,3 +25,5 @@ What to do after a release:
 - [ ] merge `main` down into `develop` to ensure `setuptools_scm` finds the latest release tag
 - [ ] update the pace PR from the pre-commit checklist to include the released version of NDSL and merge it.
 - [ ] merge breaking changes in NDSL (e.g. search for deprecation warnings)
+- [ ] update the pinned version of [pyFV3](https://github.com/NOAA-GFDL/PyFV3/) to the new release-tag
+- [ ] update the pinned version of [pySHiELD](https://github.com/NOAA-GFDL/pySHiELD) to the new release-tag

.github/workflows/fv3_translate_tests.yaml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   fv3_translate_tests:
-    uses: twicki/pyFV3/.github/workflows/translate.yaml@update/numpy_2x
+    uses: NOAA-GFDL/pyFV3/.github/workflows/translate.yaml@develop
     with:
       component_trigger: true
       component_name: NDSL

.github/workflows/pace_tests.yaml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   pace_main_tests:
-    uses: floriandeconinck/pace/.github/workflows/main_unit_tests.yaml@update/numpy_2x
+    uses: NOAA-GFDL/pace/.github/workflows/main_unit_tests.yaml@develop
     with:
       component_trigger: true
       component_name: NDSL

.github/workflows/shield_tests.yaml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   shield_translate_tests:
-    uses: floriandeconinck/pySHiELD/.github/workflows/translate.yaml@update/numpy_2x
+    uses: NOAA-GFDL/pySHiELD/.github/workflows/translate.yaml@develop
     with:
       component_trigger: true
       component_name: NDSL

external/gt4py

@@ -7,11 +7,11 @@
 Configuration is a yaml file of the shape
 ```yaml
 stencils_or_class:
-  - copy_corners_x_nord
-  - copy_corners_y_nord
-  - DGridShallowWaterLagrangianDynamics.__call__
+    - copy_corners_x_nord
+    - copy_corners_y_nord
+    - DGridShallowWaterLagrangianDynamics.__call__
 track_parameter_by_name:
-  - fy
+    - fy
 ```
 
 Global variable:
@@ -28,24 +28,22 @@
 from ndsl.logging import ndsl_log
 
 
-ndsl_debugger = None
-
-
-def _set_debugger() -> None:
+def _set_debugger() -> Debugger | None:
     config = os.getenv("NDSL_DEBUG_CONFIG", "")
     if not os.path.exists(config):
         if config != "":
             ndsl_log.warning(
                 f"NDSL_DEBUG_CONFIG set but path {config} does not exists."
             )
         else:
-            return
+            return None
     with open(config) as file:
         config_dict = yaml.load(file.read(), Loader=yaml.SafeLoader)
-    global ndsl_debugger
-    ndsl_debugger = Debugger(rank=MPIComm().Get_rank(), **config_dict)
+    debugger = Debugger(rank=MPIComm().Get_rank(), **config_dict)
     ndsl_log.info("[NDSL Debugger] On")
     ndsl_log.debug(f"[NDSL Debugger] Config:\n{config_dict}")
+    return debugger
 
 
-_set_debugger()
+ndsl_debugger = _set_debugger()
+"""Global NDSL debugger, set to None if NDSL_DEBUG_CONFIG is unset"""

ndsl/debug/config.py

@@ -298,11 +298,16 @@ def __init__(
                 "dont_fuse_callbacks",
                 value=True,
             )
-            # Unroll all loop - outer loop should be exempted with dace.nounroll
+            # Unroll no loop.
+            # Dev NOTE: while unrolling small loop could have an impact on speed
+            #           espcially small loop, the cost of potential increase in
+            #           build time is too high. The user needs to use `nounroll`
+            #           on it's own code, shifting an optimization responsability
+            #           away from the DSL. We opt for the default - no unrolling.
             dace.config.Config.set(
                 "frontend",
                 "unroll_threshold",
-                value=False,
+                value=-1,
             )
             # Allow for a longer stack dump when parsing fails
             dace.config.Config.set(

ndsl/dsl/dace/dace_config.py

@@ -17,15 +17,16 @@ def column_max(field, start_index, end_index):
         Returns: [max value, index of max value]
     """
     max_index = start_index
+    max_value = field.at(K=max_index)
     level = start_index
     while level <= end_index:
-        new = field.at(K=level)
-        old = field.at(K=max_index)
-        if new > old:
+        value = field.at(K=level)
+        if value > max_value:
+            max_value = value
             max_index = level
         level += 1
 
-    return field.at(K=max_index), max_index
+    return max_value, max_index
 
 
 @typing.no_type_check
@@ -42,15 +43,16 @@ def column_max_ddim(field, ddim, start_index, end_index):
         Returns: [max value, index of max value]
     """
     max_index = start_index
+    max_value = field.at(K=max_index, ddim=[ddim])
     level = start_index
     while level <= end_index:
-        new = field.at(K=level, ddim=[ddim])
-        old = field.at(K=max_index, ddim=[ddim])
-        if new > old:
+        value = field.at(K=level, ddim=[ddim])
+        if value > max_value:
+            max_value = value
             max_index = level
         level += 1
 
-    return field.at(K=max_index, ddim=[ddim]), max_index
+    return max_value, max_index
 
 
 @typing.no_type_check
@@ -67,15 +69,16 @@ def column_min(field, start_index, end_index):
         Returns: [min value, index of min value]
     """
     min_index = start_index
+    min_value = field.at(K=min_index)
     level = start_index
     while level <= end_index:
-        new = field.at(K=level)
-        old = field.at(K=min_index)
-        if new < old:
+        value = field.at(K=level)
+        if value < min_value:
+            min_value = value
             min_index = level
         level += 1
 
-    return field.at(K=min_index), min_index
+    return min_value, min_index
 
 
 @typing.no_type_check
@@ -92,12 +95,13 @@ def column_min_ddim(field, ddim, start_index, end_index):
         Returns: [min value, index of min value]
     """
     min_index = start_index
+    min_value = field.at(K=min_index, ddim=[ddim])
     level = start_index
     while level <= end_index:
-        new = field.at(K=level, ddim=[ddim])
-        old = field.at(K=min_index, ddim=[ddim])
-        if new < old:
+        value = field.at(K=level, ddim=[ddim])
+        if value < min_value:
+            min_value = value
             min_index = level
         level += 1
 
-    return field.at(K=min_index, ddim=[ddim]), min_index
+    return min_value, min_index