Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test[cartesian]: Unskip blocked DaCe tests after DaCe upgrade #1714

Merged
merged 1 commit into from
Nov 4, 2024
Merged

test[cartesian]: Unskip blocked DaCe tests after DaCe upgrade #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions tests/cartesian_tests/integration_tests/multi_feature_tests/test_code_generation.py
View file
Open in desktop
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
23 changes: 2 additions & 21 deletions tests/cartesian_tests/integration_tests/multi_feature_tests/test_suites.py
View file
Open in desktop
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
Loading