From 3fb6ab8ac5031d46088e1d6079724642619f00e2 Mon Sep 17 00:00:00 2001
From: Roman Cattaneo <>
Date: Mon, 28 Oct 2024 18:06:30 +0100
Subject: [PATCH] Unskip DaCe tests after DaCe upgrade

According to Florian, current versions of DaCe should be able to handle
these cases.
---
 .../test_code_generation.py                   |  6 -----
 .../multi_feature_tests/test_suites.py        | 23 ++-----------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/tests/cartesian_tests/integration_tests/multi_feature_tests/test_code_generation.py b/tests/cartesian_tests/integration_tests/multi_feature_tests/test_code_generation.py
index 398e312af3..c4d07d7337 100644
--- a/tests/cartesian_tests/integration_tests/multi_feature_tests/test_code_generation.py
+++ b/tests/cartesian_tests/integration_tests/multi_feature_tests/test_code_generation.py
@@ -366,9 +366,6 @@ def stencil(
 
 @pytest.mark.parametrize("backend", ALL_BACKENDS)
 def test_variable_offsets(backend):
-    if backend == "dace:cpu":
-        pytest.skip("Internal compiler error in GitHub action container")
-
     @gtscript.stencil(backend=backend)
     def stencil_ij(
         in_field: gtscript.Field[np.float_],
@@ -391,9 +388,6 @@ def stencil_ijk(
 
 @pytest.mark.parametrize("backend", ALL_BACKENDS)
 def test_variable_offsets_and_while_loop(backend):
-    if backend == "dace:cpu":
-        pytest.skip("Internal compiler error in GitHub action container")
-
     @gtscript.stencil(backend=backend)
     def stencil(
         pe1: gtscript.Field[np.float_],
diff --git a/tests/cartesian_tests/integration_tests/multi_feature_tests/test_suites.py b/tests/cartesian_tests/integration_tests/multi_feature_tests/test_suites.py
index 44112f3899..d3a5744389 100644
--- a/tests/cartesian_tests/integration_tests/multi_feature_tests/test_suites.py
+++ b/tests/cartesian_tests/integration_tests/multi_feature_tests/test_suites.py
@@ -738,29 +738,10 @@ def validation(field_in, field_out, *, domain, origin):
         field_out[:, :, 0] = field_in[:, :, 0]
 
 
-def _skip_dace_cpu_gcc_error(backends):
-    paramtype = type(pytest.param())
-    res = []
-    for b in backends:
-        if isinstance(b, paramtype) and b.values[0] == "dace:cpu":
-            res.append(
-                pytest.param(
-                    *b.values,
-                    marks=[
-                        *b.marks,
-                        pytest.mark.skip("Internal compiler error in GitHub action container"),
-                    ],
-                )
-            )
-        else:
-            res.append(b)
-    return res
-
-
 class TestVariableKRead(gt_testing.StencilTestSuite):
     dtypes = {"field_in": np.float32, "field_out": np.float32, "index": np.int32}
     domain_range = [(2, 2), (2, 2), (2, 8)]
-    backends = _skip_dace_cpu_gcc_error(ALL_BACKENDS)
+    backends = ALL_BACKENDS
     symbols = {
         "field_in": gt_testing.field(
             in_range=(-10, 10), axes="IJK", boundary=[(0, 0), (0, 0), (0, 0)]
@@ -782,7 +763,7 @@ def validation(field_in, field_out, index, *, domain, origin):
 class TestVariableKAndReadOutside(gt_testing.StencilTestSuite):
     dtypes = {"field_in": np.float64, "field_out": np.float64, "index": np.int32}
     domain_range = [(2, 2), (2, 2), (2, 8)]
-    backends = _skip_dace_cpu_gcc_error(ALL_BACKENDS)
+    backends = ALL_BACKENDS
     symbols = {
         "field_in": gt_testing.field(
             in_range=(0.1, 10), axes="IJK", boundary=[(0, 0), (0, 0), (1, 0)]