Merge branch 'main' into fix_solve_nonhydro_divdamp_fac_o2

C2SM · Nov 17, 2023 · 3df90b0 · 3df90b0
2 parents 7ce558e + 9d0614b
commit 3df90b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ci/cscs.yml b/ci/cscs.yml
@@ -17,7 +17,7 @@ variables:
     DOCKERFILE: ci/docker/Dockerfile.build
 
 .test_template:
-  extends: .container-runner-hohgant-a100
+  extends: .container-runner-clariden-a100
   timeout: 2h
   image: $PERSIST_IMAGE_NAME
   before_script:

diff --git a/model/common/src/icon4py/model/common/grid/utils.py b/model/common/src/icon4py/model/common/grid/utils.py
@@ -30,7 +30,7 @@ class ClassLevelCache:
     @staticmethod
     def cache_method(method):
         def wrapper(self, *args, **kwargs):
-            key = f"{method.__name__}_{args}_{kwargs}"
+            key = f"{self.__class__.__name__}_{method.__name__}_{args}_{kwargs}"
             if key not in ClassLevelCache._cache:
                 ClassLevelCache._cache[key] = method(self, *args, **kwargs)
             return ClassLevelCache._cache[key]

diff --git a/tools/tests/icon4pygen/test_codegen.py b/tools/tests/icon4pygen/test_codegen.py
@@ -109,7 +109,7 @@ def check_header_codegen(fname: str) -> None:
 
 def check_gridtools_codegen(fname: str) -> None:
     stencil_name = fname.replace(".hpp", "")
-    patterns = ["#include <.*>", "using .*;", f"inline auto {stencil_name}"]
+    patterns = ["#include <.*>", "using .*;", f"inline\\s+auto\\s+{stencil_name}"]
     check_for_matches(fname, patterns)