diff --git a/model/common/src/icon4py/model/common/test_utils/helpers.py b/model/common/src/icon4py/model/common/test_utils/helpers.py index 2826042b0a..a92edd1a79 100644 --- a/model/common/src/icon4py/model/common/test_utils/helpers.py +++ b/model/common/src/icon4py/model/common/test_utils/helpers.py @@ -22,7 +22,10 @@ from gt4py.next import common as gt_common from gt4py.next import constructors from gt4py.next.ffront.decorator import Program -from gt4py.next.program_processors.otf_compile_executor import OTFCompileExecutor +from gt4py.next.program_processors.otf_compile_executor import ( + CachedOTFCompileExecutor, + OTFCompileExecutor, +) from ..grid.base import BaseGrid from ..grid.icon import IconGrid @@ -242,7 +245,7 @@ def uses_icon_grid_with_otf(backend, grid): Is needed to skip certain stencils where the execution domain needs to be restricted or boundary taken into account. """ if hasattr(backend, "executor") and isinstance(grid, IconGrid): - if isinstance(backend.executor, OTFCompileExecutor): + if isinstance(backend.executor, (OTFCompileExecutor, CachedOTFCompileExecutor)): return True return False diff --git a/model/common/src/icon4py/model/common/test_utils/pytest_config.py b/model/common/src/icon4py/model/common/test_utils/pytest_config.py index 5e5ec9bf71..4ae19688f3 100644 --- a/model/common/src/icon4py/model/common/test_utils/pytest_config.py +++ b/model/common/src/icon4py/model/common/test_utils/pytest_config.py @@ -14,8 +14,7 @@ import os import pytest -from gt4py.next.program_processors.runners.gtfn import run_gtfn, run_gtfn_gpu -from gt4py.next.program_processors.runners.roundtrip import backend as run_roundtrip +from gt4py.next import gtfn_cpu, gtfn_gpu, itir_python def pytest_configure(config): @@ -89,9 +88,9 @@ def pytest_generate_tests(metafunc): backends = { "embedded": None, - "roundtrip": run_roundtrip, - "gtfn_cpu": run_gtfn, - "gtfn_gpu": run_gtfn_gpu, + "roundtrip": itir_python, + "gtfn_cpu": gtfn_cpu, + "gtfn_gpu": gtfn_gpu, } gpu_backends = ["gtfn_gpu"]