From 62478eb449c5548b90b6fe193ac13648285dd05c Mon Sep 17 00:00:00 2001 From: Edoardo Paone Date: Wed, 4 Dec 2024 09:37:18 +0100 Subject: [PATCH] cleanup test markers in gt4py-next --- pyproject.toml | 3 --- tests/next_tests/definitions.py | 5 ----- .../feature_tests/ffront_tests/test_execution.py | 4 ---- .../feature_tests/iterator_tests/test_program.py | 7 ++----- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1e24094fa2..e859c9b4f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -240,17 +240,14 @@ markers = [ 'requires_atlas: tests that require `atlas4py` bindings package', 'requires_dace: tests that require `dace` package', 'requires_gpu: tests that require a NVidia GPU (`cupy` and `cudatoolkit` are required)', - 'starts_from_gtir_program: tests that require backend to start lowering from GTIR program', 'uses_applied_shifts: tests that require backend support for applied-shifts', 'uses_constant_fields: tests that require backend support for constant fields', 'uses_dynamic_offsets: tests that require backend support for dynamic offsets', 'uses_floordiv: tests that require backend support for floor division', 'uses_if_stmts: tests that require backend support for if-statements', 'uses_index_fields: tests that require backend support for index fields', - 'uses_lift_expressions: tests that require backend support for lift expressions', 'uses_negative_modulo: tests that require backend support for modulo on negative numbers', 'uses_origin: tests that require backend support for domain origin', - 'uses_reduction_over_lift_expressions: tests that require backend support for reduction over lift expressions', 'uses_reduction_with_only_sparse_fields: tests that require backend support for with sparse fields', 'uses_scan: tests that uses scan', 'uses_scan_in_field_operator: tests that require backend support for scan in field operator', diff --git a/tests/next_tests/definitions.py b/tests/next_tests/definitions.py index 1593ab3ba6..80b8f4f39b 100644 --- a/tests/next_tests/definitions.py +++ b/tests/next_tests/definitions.py @@ -85,8 +85,6 @@ class ProgramFormatterId(_PythonObjectIdMixin, str, enum.Enum): # to avoid needing to mark all tests. ALL = "all" REQUIRES_ATLAS = "requires_atlas" -# TODO(havogt): Remove, skipped during refactoring to GTIR -STARTS_FROM_GTIR_PROGRAM = "starts_from_gtir_program" USES_APPLIED_SHIFTS = "uses_applied_shifts" USES_CONSTANT_FIELDS = "uses_constant_fields" USES_DYNAMIC_OFFSETS = "uses_dynamic_offsets" @@ -94,10 +92,8 @@ class ProgramFormatterId(_PythonObjectIdMixin, str, enum.Enum): USES_IF_STMTS = "uses_if_stmts" USES_IR_IF_STMTS = "uses_ir_if_stmts" USES_INDEX_FIELDS = "uses_index_fields" -USES_LIFT_EXPRESSIONS = "uses_lift_expressions" USES_NEGATIVE_MODULO = "uses_negative_modulo" USES_ORIGIN = "uses_origin" -USES_REDUCTION_OVER_LIFT_EXPRESSIONS = "uses_reduction_over_lift_expressions" USES_SCAN = "uses_scan" USES_SCAN_IN_FIELD_OPERATOR = "uses_scan_in_field_operator" USES_SCAN_IN_STENCIL = "uses_scan_in_stencil" @@ -117,7 +113,6 @@ class ProgramFormatterId(_PythonObjectIdMixin, str, enum.Enum): USES_MESH_WITH_SKIP_VALUES = "uses_mesh_with_skip_values" USES_SCALAR_IN_DOMAIN_AND_FO = "uses_scalar_in_domain_and_fo" CHECKS_SPECIFIC_ERROR = "checks_specific_error" -USES_INDEX_BUILTIN = "uses_index_builtin" # Skip messages (available format keys: 'marker', 'backend') UNSUPPORTED_MESSAGE = "'{marker}' tests not supported by '{backend}' backend" diff --git a/tests/next_tests/integration_tests/feature_tests/ffront_tests/test_execution.py b/tests/next_tests/integration_tests/feature_tests/ffront_tests/test_execution.py index 0d994d1b22..33302f7770 100644 --- a/tests/next_tests/integration_tests/feature_tests/ffront_tests/test_execution.py +++ b/tests/next_tests/integration_tests/feature_tests/ffront_tests/test_execution.py @@ -291,7 +291,6 @@ def testee(a: tuple[cases.VField, cases.EField]) -> cases.VField: ) -@pytest.mark.uses_index_fields @pytest.mark.uses_cartesian_shift def test_scalar_arg_with_field(cartesian_case): @gtx.field_operator @@ -586,7 +585,6 @@ def combine(a: cases.IField, b: cases.IField) -> cases.IField: @pytest.mark.uses_unstructured_shift -@pytest.mark.uses_reduction_over_lift_expressions def test_nested_reduction(unstructured_case): @gtx.field_operator def testee(a: cases.VField) -> cases.VField: @@ -706,7 +704,6 @@ def simple_scan_operator(carry: float) -> float: @pytest.mark.uses_scan -@pytest.mark.uses_lift_expressions @pytest.mark.uses_scan_nested def test_solve_triag(cartesian_case): @gtx.scan_operator(axis=KDim, forward=True, init=(0.0, 0.0)) @@ -788,7 +785,6 @@ def testee( @pytest.mark.uses_constant_fields @pytest.mark.uses_unstructured_shift -@pytest.mark.uses_reduction_over_lift_expressions def test_ternary_builtin_neighbor_sum(unstructured_case): @gtx.field_operator def testee(a: cases.EField, b: cases.EField) -> cases.VField: diff --git a/tests/next_tests/integration_tests/feature_tests/iterator_tests/test_program.py b/tests/next_tests/integration_tests/feature_tests/iterator_tests/test_program.py index f6fd0a48d0..c79f8dbb6b 100644 --- a/tests/next_tests/integration_tests/feature_tests/iterator_tests/test_program.py +++ b/tests/next_tests/integration_tests/feature_tests/iterator_tests/test_program.py @@ -42,7 +42,6 @@ def copy_program(inp, out, size): ) -@pytest.mark.starts_from_gtir_program def test_prog(program_processor): program_processor, validate = program_processor @@ -64,8 +63,7 @@ def index_program_simple(out, size): ) -@pytest.mark.starts_from_gtir_program -@pytest.mark.uses_index_builtin +@pytest.mark.uses_index_fields def test_index_builtin(program_processor): program_processor, validate = program_processor @@ -88,8 +86,7 @@ def index_program_shift(out, size): ) -@pytest.mark.starts_from_gtir_program -@pytest.mark.uses_index_builtin +@pytest.mark.uses_index_fields def test_index_builtin_shift(program_processor): program_processor, validate = program_processor