Skip to content

Commit

Permalink
ci[cartesian]: Thread safe parallel stencil tests (#1849)
Browse files Browse the repository at this point in the history
<!--
Delete this comment and add a proper description of the changes
contained in this PR. The text here will be used in the commit message
since the approved PRs are always squash-merged. The preferred format
is:

- PR Title: <type>[<scope>]: <one-line-summary>

    <type>:
- build: Changes that affect the build system or external dependencies
        - ci: Changes to our CI configuration files and scripts
        - docs: Documentation only changes
        - feat: A new feature
        - fix: A bug fix
        - perf: A code change that improves performance
- refactor: A code change that neither fixes a bug nor adds a feature
        - style: Changes that do not affect the meaning of the code
        - test: Adding missing tests or correcting existing tests

    <scope>: cartesian | eve | next | storage
    # ONLY if changes are limited to a specific subsystem

- PR Description:

Description of the main changes with links to appropriate
issues/documents/references/...
-->

## Description

To avoid repeating boiler plate code in testing, `StencilTestSuite`
provides a convenient interace to test gtscript stencils.

Within that `StencilTestSuite` base class, generating the stencil is
separated from running & validating the stencil code. Each deriving test
class will end up with two tests: one for stencil generation and a
second one to test the implementation by running the generated code with
defined inputs and expected outputs.

The base class was written such that the implementation test would
re-use the generated stencil code from the first test. This introduces
an implicit test order dependency. To save time and avoid unnecessary
test failure outputs, failing to generate the stencil code would
automatically skip the implementation/validation test.

Running tests in parallel (with `xdist`) breaks the expected test
execution order (in the default configuration). This leads to
automatically skiped validation tests in case the stencil code wasn't
generated yet. On the CI, we only run with 2 threads so only a couple
tests were skipped usually. Locally, I was running with 16 threads and
got ~30 skipped validation tests.

This PR proposes to address the issue by setting an `xdist_group` mark
on the generation/implementation tests that belong togehter. In
combination with `--dist loadgroup`, this will keep the expected order
where necessary. Only tests with `xdist_group` markers are affected by
`--dist loadgroup`. Tests without that marker will be distributed
normally as if in `--dist load` mode (the default so far). By grouping
with `cls_name` and backend, we keep maximal parallelization, grouping
only the two tests that are depending on each other.

Further reading: see [`--dist`
section](https://pytest-xdist.readthedocs.io/en/stable/distribution.html)
in `pytest-xdist` documentation.

## Requirements

- [x] All fixes and/or new features come with corresponding tests.
Existing tests are still green. No more skipped tests \o/ Works as
expected locally
- [ ] Important design decisions have been documented in the appropriate
ADR inside the [docs/development/ADRs/](docs/development/ADRs/Index.md)
folder.
  N/A

---------

Co-authored-by: Roman Cattaneo <[email protected]>
  • Loading branch information
romanc and romanc authored Feb 7, 2025
1 parent 34b574a commit 4b566d7
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 22 deletions.
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def test_cartesian(
markers = " and ".join(codegen_settings["markers"] + device_settings["markers"])

session.run(
*f"pytest --cache-clear -sv -n {num_processes}".split(),
*f"pytest --cache-clear -sv -n {num_processes} --dist loadgroup".split(),
*("-m", f"{markers}"),
str(pathlib.Path("tests") / "cartesian_tests"),
*session.posargs,
Expand Down
56 changes: 35 additions & 21 deletions src/gt4py/cartesian/testing/suites.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def get_globals_combinations(dtypes):
generation_strategy=composite_strategy_factory(
d, generation_strategy_factories
),
implementations=[],
implementation=None,
test_id=len(cls_dict["tests"]),
definition=annotate_function(
function=cls_dict["definition"],
Expand Down Expand Up @@ -199,14 +199,19 @@ def hyp_wrapper(test_hyp, hypothesis_data):

for test in cls_dict["tests"]:
if test["suite"] == cls_name:
marks = test["marks"]
if gt4pyc.backend.from_name(test["backend"]).storage_info["device"] == "gpu":
marks.append(pytest.mark.requires_gpu)
name = test["backend"]
name += "".join(f"_{key}_{value}" for key, value in test["constants"].items())
name += "".join(
"_{}_{}".format(key, value.name) for key, value in test["dtypes"].items()
)

marks = test["marks"].copy()
if gt4pyc.backend.from_name(test["backend"]).storage_info["device"] == "gpu":
marks.append(pytest.mark.requires_gpu)
# Run generation and implementation tests in the same group to ensure
# (thread-) safe parallelization of stencil tests.
marks.append(pytest.mark.xdist_group(name=f"{cls_name}_{name}"))

param = pytest.param(test, marks=marks, id=name)
pytest_params.append(param)

Expand All @@ -228,14 +233,19 @@ def hyp_wrapper(test_hyp, hypothesis_data):
runtime_pytest_params = []
for test in cls_dict["tests"]:
if test["suite"] == cls_name:
marks = test["marks"]
if gt4pyc.backend.from_name(test["backend"]).storage_info["device"] == "gpu":
marks.append(pytest.mark.requires_gpu)
name = test["backend"]
name += "".join(f"_{key}_{value}" for key, value in test["constants"].items())
name += "".join(
"_{}_{}".format(key, value.name) for key, value in test["dtypes"].items()
)

marks = test["marks"].copy()
if gt4pyc.backend.from_name(test["backend"]).storage_info["device"] == "gpu":
marks.append(pytest.mark.requires_gpu)
# Run generation and implementation tests in the same group to ensure
# (thread-) safe parallelization of stencil tests.
marks.append(pytest.mark.xdist_group(name=f"{cls_name}_{name}"))

runtime_pytest_params.append(
pytest.param(
test,
Expand Down Expand Up @@ -434,8 +444,11 @@ class StencilTestSuite(metaclass=SuiteMeta):
def _test_generation(cls, test, externals_dict):
"""Test source code generation for all *backends* and *stencil suites*.
The generated implementations are cached in a :class:`utils.ImplementationsDB`
instance, to avoid duplication of (potentially expensive) compilations.
The generated implementation is cached in the test context, to avoid duplication
of (potentially expensive) compilation.
Note: This caching introduces a dependency between tests, which is captured by an
`xdist_group` marker in combination with `--dist loadgroup` to ensure safe parallel
test execution.
"""
backend_slug = gt_utils.slugify(test["backend"], valid_symbols="")
implementation = gtscript.stencil(
Expand All @@ -461,7 +474,8 @@ def _test_generation(cls, test, externals_dict):
or ax == "K"
or field_info.boundary[i] >= cls.global_boundaries[name][i]
)
test["implementations"].append(implementation)
assert test["implementation"] is None
test["implementation"] = implementation

@classmethod
def _run_test_implementation(cls, parameters_dict, implementation): # too complex
Expand Down Expand Up @@ -585,16 +599,16 @@ def _run_test_implementation(cls, parameters_dict, implementation): # too compl
def _test_implementation(cls, test, parameters_dict):
"""Test computed values for implementations generated for all *backends* and *stencil suites*.
The generated implementations are reused from previous tests by means of a
:class:`utils.ImplementationsDB` instance shared at module scope.
The generated implementation was cached in the test context, to avoid duplication
of (potentially expensive) compilation.
Note: This caching introduces a dependency between tests, which is captured by an
`xdist_group` marker in combination with `--dist loadgroup` to ensure safe parallel
test execution.
"""
implementation_list = test["implementations"]
if not implementation_list:
pytest.skip(
"Cannot perform validation tests, since there are no valid implementations."
)
for implementation in implementation_list:
if not isinstance(implementation, StencilObject):
raise RuntimeError("Wrong function got from implementations_db cache!")
implementation = test["implementation"]
assert (
implementation is not None
), "Stencil implementation not found. This usually means code generation failed."
assert isinstance(implementation, StencilObject)

cls._run_test_implementation(parameters_dict, implementation)
cls._run_test_implementation(parameters_dict, implementation)

0 comments on commit 4b566d7

Please sign in to comment.