Skip to content

Commit

Permalink
Unskip DaCe tests after DaCe upgrade
Browse files Browse the repository at this point in the history
According to Florian, current versions of DaCe should be able to handle
these cases.
  • Loading branch information
Roman Cattaneo committed Oct 28, 2024
1 parent 692c14b commit 3fb6ab8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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_],
Expand All @@ -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_],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand All @@ -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)]
Expand Down

0 comments on commit 3fb6ab8

Please sign in to comment.