Merge pull request #351 from ecmwf-ifs/naan-nabr-update-ecwam-regression

Fix DEV_ALLOC_SIZE for ecwam regression and add SCC-HOIST variant
ecmwf-ifs · Jul 26, 2024 · 97dad78 · 97dad78
2 parents 8945845 + 6f8e8cb
commit 97dad78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml
@@ -76,8 +76,7 @@ jobs:
       - name: Install ECWAM dependencies
         run: |
           sudo apt-get -o Acquire::Retries=3 install -y libopenmpi-dev
-          source loki-activate
-          pip install fypp
+          pip install pyyaml fypp
 
       - name: Run CLOUDSC and ECWAM regression tests
         env:

diff --git a/loki/transformations/tests/test_ecwam.py b/loki/transformations/tests/test_ecwam.py
@@ -47,7 +47,7 @@ def fixture_bundle_create(here, local_loki_bundle):
 
 @pytest.mark.usefixtures('bundle_create')
 @pytest.mark.skipif(not HAVE_FP, reason="FP needed for ECWAM parsing")
-@pytest.mark.parametrize('mode', ['idem', 'idem-stack', 'scc', 'scc-stack'])
+@pytest.mark.parametrize('mode', ['idem', 'idem-stack', 'scc', 'scc-stack', 'scc-hoist'])
 def test_ecwam(here, mode, tmp_path):
     build_dir = tmp_path/'build'
     build_cmd = [
@@ -68,7 +68,7 @@ def test_ecwam(here, mode, tmp_path):
     # Raise stack limit
     resource.setrlimit(resource.RLIMIT_STACK, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
     env = os.environ.copy()
-    env.update({'OMP_STACKSIZE': '2G', 'NVCOMPILER_ACC_CUDA_HEAPSIZE': '2G'})
+    env.update({'OMP_STACKSIZE': '2G', 'NVCOMPILER_ACC_CUDA_HEAPSIZE': '2G', 'DEV_ALLOC_SIZE': '2147483648'})
 
     # create rundir
     rundir = build_dir/'wamrun_48'