icon4py-testing 0.2.0__tar.gz → 0.3.0__tar.gz

{icon4py_testing-0.2.0 → icon4py_testing-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icon4py-testing
-Version: 0.2.0
+Version: 0.3.0
 Summary: Testing utils for the icon4py model.
 Author-email: ETH Zurich <gridtools@cscs.ch>
 License: BSD-3 License
@@ -12,8 +12,6 @@ Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
@@ -21,16 +19,15 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: icon4py-common[io]~=0.2.0
+Requires-Dist: icon4py-common[io]~=0.3.0
 Requires-Dist: filelock<3.20,>=3.18.0
-Requires-Dist: gt4py==1.1.10
+Requires-Dist: gt4py==1.1.12
 Requires-Dist: numpy>=1.23.3
 Requires-Dist: packaging>=20.0
 Requires-Dist: pooch>=1.7.0
 Requires-Dist: pytest>=8.0.1
 Requires-Dist: serialbox4py>=2.6.2
-Requires-Dist: typing-extensions>=4.11.0
 
 # Testing utils for Python ICON port

{icon4py_testing-0.2.0 → icon4py_testing-0.3.0}/pyproject.toml

@@ -15,8 +15,6 @@ classifiers = [
   'Programming Language :: Python',
   'Programming Language :: Python :: 3',
   'Programming Language :: Python :: 3 :: Only',
-  'Programming Language :: Python :: 3.10',
-  'Programming Language :: Python :: 3.11',
   'Programming Language :: Python :: 3.12',
   'Programming Language :: Python :: 3.13',
   'Programming Language :: Python :: 3.14',
@@ -27,27 +25,26 @@ classifiers = [
 ]
 dependencies = [
   # workspace members
-  'icon4py-common[io]~=0.2.0',
+  'icon4py-common[io]~=0.3.0',
   # external dependencies
   # TODO(msimberg): https://github.com/tox-dev/filelock/pull/408 added in 3.20.4
   # and 3.21.0 seems to lead to hangs in CI. Investigate if other lock types are
   # safe or if this is a bug in filelock.
   "filelock>=3.18.0,<3.20",
-  "gt4py==1.1.10",
+  "gt4py==1.1.12",
   "numpy>=1.23.3",
   'packaging>=20.0',
   "pooch>=1.7.0",
   "pytest>=8.0.1",
-  "serialbox4py>=2.6.2",
-  "typing-extensions>=4.11.0"
+  "serialbox4py>=2.6.2"
 ]
 description = "Testing utils for the icon4py model."
 license = {text = "BSD-3 License"}
 name = "icon4py-testing"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 # managed by bump-my-version:
-version = "0.2.0"
+version = "0.3.0"
 
 [project.urls]
 Homepage = 'https://github.com/C2SM/icon4py'
@@ -56,7 +53,7 @@ Homepage = 'https://github.com/C2SM/icon4py'
 [tool.bumpversion]
 allow_dirty = false
 commit = false
-current_version = "0.2.0"
+current_version = "0.3.0"
 ignore_missing_version = false
 message = 'Bump icon4py-testing version: {current_version} → {new_version}'
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(?:(?P<pre_l>a|b|rc)(?P<pre_n>\\d+))?"

{icon4py_testing-0.2.0 → icon4py_testing-0.3.0}/src/icon4py/model/testing/__init__.py

@@ -25,5 +25,5 @@ __copyright__: Final = "Copyright (c) 2022-2024 ETH Zurich and MeteoSwiss"
 __license__: Final = "BSD-3-Clause"
 
 
-__version__: Final = "0.2.0"
+__version__: Final = "0.3.0"
 __version_info__: Final = pkg_version.parse(__version__)

icon4py_testing-0.3.0/src/icon4py/model/testing/datatest_utils.py

@@ -0,0 +1,140 @@
+# ICON4Py - ICON inspired code in Python and GT4Py
+#
+# Copyright (c) 2022-2024, ETH Zurich and MeteoSwiss
+# All rights reserved.
+#
+# Please, refer to the LICENSE file in the root directory.
+# SPDX-License-Identifier: BSD-3-Clause
+
+from __future__ import annotations
+
+import logging
+import pathlib
+import urllib.parse
+
+import gt4py.next.typing as gtx_typing
+
+from icon4py.model.common.decomposition import definitions as decomposition
+from icon4py.model.standalone_driver import config as driver_config
+from icon4py.model.testing import data_handling, definitions, serialbox
+
+
+logger = logging.getLogger(__name__)
+
+
+def get_process_properties_for_run(
+    run_instance: decomposition.RunType,
+) -> decomposition.ProcessProperties:
+    return decomposition.get_process_properties(run_instance)
+
+
+def get_experiment_name_with_version(
+    experiment_description: definitions.ExperimentDescription,
+) -> str:
+    """Generate experiment name with version suffix."""
+    return f"{experiment_description.name}_v{experiment_description.version:02d}"
+
+
+def get_ranked_experiment_name_with_version(
+    experiment_description: definitions.ExperimentDescription, comm_size: int
+) -> str:
+    """Generate ranked experiment name with version suffix."""
+    return f"mpitask{comm_size}_{get_experiment_name_with_version(experiment_description)}"
+
+
+def get_experiment_archive_filename(
+    experiment_description: definitions.ExperimentDescription, comm_size: int
+) -> str:
+    """Generate ranked archive filename for an experiment."""
+    return f"{get_ranked_experiment_name_with_version(experiment_description, comm_size)}.tar.gz"
+
+
+def get_experiment_archive_url(root_url: str, filepath: str) -> str:
+    """Build a download URL for experiment archive from root URL."""
+    return f"{root_url}/{urllib.parse.quote(filepath)}"
+
+
+def get_grid_archive_filename(grid: definitions.GridDescription) -> str:
+    return f"{grid.name}.tar.gz"
+
+
+def get_grid_filename(grid: definitions.GridDescription) -> str:
+    return f"{grid.name}.nc"
+
+
+def get_grid_filepath(grid: definitions.GridDescription) -> pathlib.Path:
+    return definitions.grids_path().joinpath(grid.name, get_grid_filename(grid))
+
+
+def get_grid_archive_url(root_url: str, grid: definitions.GridDescription) -> str:
+    """Build a download URL for a grid archive from root URL."""
+    filepath = f"{definitions.GRID_DATA_DIR}/{get_grid_archive_filename(grid)}"
+    return f"{root_url}/{urllib.parse.quote(filepath)}"
+
+
+def get_muphys_archive_url(root_url: str, experiment_type: str, experiment_name: str) -> str:
+    """Build a download URL for a muphys archive from root URL."""
+    filepath = f"{definitions.MUPHYS_DATA_DIR}/{experiment_type}/{experiment_name}.tar.gz"
+    return f"{root_url}/{urllib.parse.quote(filepath)}"
+
+
+def get_path_for_experiment(
+    experiment_description: definitions.ExperimentDescription,
+    process_props: decomposition.ProcessProperties,
+) -> pathlib.Path:
+    """Get the path to an experiment root directory."""
+
+    experiment_dir = get_ranked_experiment_name_with_version(
+        experiment_description,
+        process_props.comm_size,
+    )
+    return definitions.serialized_data_path() / experiment_dir
+
+
+def get_datapath_for_experiment(
+    experiment_description: definitions.ExperimentDescription,
+    process_props: decomposition.ProcessProperties,
+) -> pathlib.Path:
+    """Get the path to serialized data for an experiment."""
+
+    experiment_path = get_path_for_experiment(
+        experiment_description,
+        process_props,
+    )
+    return experiment_path.joinpath(definitions.SERIALIZED_DATA_SUBDIR)
+
+
+def create_icon_serial_data_provider(
+    datapath: pathlib.Path,
+    rank: int,
+    backend: gtx_typing.Backend | None,
+) -> serialbox.IconSerialDataProvider:
+    return serialbox.IconSerialDataProvider(
+        backend=backend,
+        fname_prefix="icon_pydycore",
+        path=str(datapath),
+        mpi_rank=rank,
+        do_print=True,
+    )
+
+
+def download_experiment(
+    experiment_description: definitions.ExperimentDescription,
+    processor_props: decomposition.ProcessProperties,
+) -> None:
+    """Download data and config for an experiment--if not already present."""
+    comm_size = processor_props.comm_size
+    root_url = definitions.TESTDATA_ROOT_URL
+    archive_filename = get_experiment_archive_filename(experiment_description, comm_size)
+    archive_path = definitions.EXPERIMENT_DATA_DIR + "/" + archive_filename
+    uri = get_experiment_archive_url(root_url, archive_path)
+    destination_path = get_datapath_for_experiment(experiment_description, processor_props)
+    data_handling.download_test_data(destination_path.parent, uri)
+
+
+def create_experiment_configuration(
+    experiment_description: definitions.ExperimentDescription,
+    processor_props: decomposition.ProcessProperties,
+) -> driver_config.ExperimentConfig:
+    experiment_path = get_path_for_experiment(experiment_description, processor_props)
+    return driver_config.read_experiment_config_from_fortran(experiment_path)

{icon4py_testing-0.2.0 → icon4py_testing-0.3.0}/src/icon4py/model/testing/definitions.py

@@ -11,27 +11,15 @@ from __future__ import annotations
 import copy
 import dataclasses
 import pathlib
-from typing import TYPE_CHECKING, Final
-
-from icon4py.model.atmosphere.subgrid_scale_physics.microphysics import (
-    single_moment_six_class_gscp_graupel as graupel,
-)
-from icon4py.model.common.grid import icon as icon_grid, vertical as v_grid
-from icon4py.model.common.interpolation import interpolation_factory
-from icon4py.model.common.metrics import metrics_factory
+from typing import Final
+
+from icon4py.model.common.grid import icon as icon_grid
 from icon4py.model.standalone_driver import config as driver_config
 from icon4py.model.testing import config
 
 
-if TYPE_CHECKING:
-    from icon4py.model.atmosphere.diffusion import diffusion
-    from icon4py.model.atmosphere.dycore import solve_nonhydro as solve_nh
-
-
 SERIALIZED_DATA_DIR: Final = "ser_icondata"
 SERIALIZED_DATA_SUBDIR: Final = "ser_data"
-NAMELIST_ATM_FNAME: Final = "NAMELIST_ICON_output_atm"
-NAMELIST_MASTER_FNAME: Final = "icon_master.namelist"
 GRID_DATA_DIR: Final = "grids"
 EXPERIMENT_DATA_DIR: Final = "experiments"
 MUPHYS_DATA_DIR: Final = "muphys"
@@ -46,7 +34,7 @@ def grids_path() -> pathlib.Path:
     return config.TEST_DATA_PATH.joinpath(GRID_DATA_DIR)
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(frozen=True)
 class GridDescription:
     name: str
     description: str
@@ -163,32 +151,23 @@ class Grids:
     )
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(frozen=True)
 class ExperimentDescription:
     name: str
     long_name: str
     grid: GridDescription
-    version: int = 4
-
-
-@dataclasses.dataclass
-class ExperimentConfig:
-    driver: driver_config.DriverConfig
-    vertical_grid: v_grid.VerticalGridConfig
-    nonhydrostatic: solve_nh.NonHydrostaticConfig
-    diffusion: diffusion.DiffusionConfig
-    metrics: metrics_factory.MetricsConfig
-    interpolation: interpolation_factory.InterpolationConfig
-    graupel: graupel.SingleMomentSixClassIconGraupelConfig
+    version: int = 5
 
 
 @dataclasses.dataclass
 class Experiment:
     description: ExperimentDescription
-    _config: ExperimentConfig
+    _config: driver_config.ExperimentConfig
 
     def __init__(
-        self, experiment_description: ExperimentDescription, experiment_config: ExperimentConfig
+        self,
+        experiment_description: ExperimentDescription,
+        experiment_config: driver_config.ExperimentConfig,
     ) -> None:
         self.description = experiment_description
         self._config = experiment_config
@@ -202,7 +181,7 @@ class Experiment:
         return self.description.grid
 
     @property
-    def config(self) -> ExperimentConfig:
+    def config(self) -> driver_config.ExperimentConfig:
         # Return a deep copy so that tests cannot mutate the shared cached config.
         return copy.deepcopy(self._config)
 
@@ -213,6 +192,11 @@ class Experiments:
         long_name="EXCLAIM Aquaplanet experiment",
         grid=Grids.R02B04_GLOBAL,
     )
+    EXCLAIM_APE_AES: Final = ExperimentDescription(
+        name="exclaim_ape_aesPhys",
+        long_name="EXCLAIM Aquaplanet experiment. JW IC and AES physics",
+        grid=Grids.R02B04_GLOBAL,
+    )
     MCH_CH_R04B09: Final = ExperimentDescription(
         name="exclaim_ch_r04b09_dsl",
         long_name="Regional setup used by EXCLAIM to validate the icon-exclaim.",

{icon4py_testing-0.2.0 → icon4py_testing-0.3.0}/src/icon4py/model/testing/filters.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 
 import functools
 from collections.abc import Callable
-from typing import NamedTuple, TypeAlias, TypeVar
+from typing import NamedTuple
 
 import pytest
 
@@ -19,8 +19,7 @@ from icon4py.model.common.utils import device_utils
 from icon4py.model.testing import test_utils
 
 
-T = TypeVar("T")
-Predicate: TypeAlias = Callable[[T], bool]
+type Predicate[T] = Callable[[T], bool]
 
 
 class ItemFilter(NamedTuple):
@@ -55,10 +54,6 @@ item_marker_filters: dict[str, ItemFilter] = {
             pytest.xfail, " gt4py _compiled_programs returns error when backend is None."
         ),
     ),
-    pytest.mark.uses_as_offset.name: ItemFilter(
-        condition=lambda item: test_utils.is_embedded(test_utils.get_backend_fixture_value(item)),
-        action=functools.partial(pytest.xfail, "Embedded backend does not support as_offset."),
-    ),
     pytest.mark.uses_concat_where.name: ItemFilter(
         condition=lambda item: test_utils.is_embedded(test_utils.get_backend_fixture_value(item)),
         action=functools.partial(pytest.xfail, "Embedded backend does not support concat_where."),

{icon4py_testing-0.2.0 → icon4py_testing-0.3.0}/src/icon4py/model/testing/fixtures/benchmark.py

@@ -13,17 +13,18 @@ import gt4py.next as gtx
 import pytest
 
 import icon4py.model.common.dimension as dims
-from icon4py.model.common import model_backends, model_options
+from icon4py.model.common import model_backends, model_options, topography
 from icon4py.model.common.decomposition import definitions as decomposition
 from icon4py.model.common.grid import (
     geometry as grid_geometry,
     geometry_attributes as geometry_meta,
+    geometry_config,
     grid_manager as gm,
     vertical as v_grid,
 )
-from icon4py.model.common.initialization import topography
 from icon4py.model.common.interpolation import interpolation_attributes, interpolation_factory
 from icon4py.model.common.metrics import metrics_attributes, metrics_factory
+from icon4py.model.common.topography.analytical import jablonowski_williamson as jw_topo
 
 
 @pytest.fixture(
@@ -43,11 +44,13 @@ def geometry_field_source(
     geometry_field_source = grid_geometry.GridGeometry(
         grid=mesh,
         decomposition_info=decomposition_info,
-        exchange=decomposition.single_node_exchange,
         backend=generic_concrete_backend,
         coordinates=grid_manager.coordinates,
         extra_fields=grid_manager.geometry_fields,
         metadata=geometry_meta.attrs,
+        config=geometry_config.GeometryConfig(),
+        process_props=decomposition.SingleNodeProcessProperties(),
+        exchange=decomposition.single_node_exchange,
     )
     yield geometry_field_source
 
@@ -107,9 +110,14 @@ def metrics_field_source(
         vct_b=vct_b,
     )
 
-    topo_c = topography.jablonowski_williamson(
-        cell_lat=geometry_field_source.get(geometry_meta.CELL_LAT).ndarray,
-        u0=35.0,
+    config = topography.TopographyConfig(
+        config=jw_topo.JablonowskiWilliamsonConfig(),
+    )
+    topo_c = topography.create(
+        config=config,
+        grid_manager=grid_manager,
+        backend=generic_concrete_backend,
+        exchange=decomposition.single_node_exchange,
     )
 
     metrics_field_source = metrics_factory.MetricsFieldsFactory(

{icon4py_testing-0.2.0 → icon4py_testing-0.3.0}/src/icon4py/model/testing/grid_utils.py

@@ -19,6 +19,7 @@ from icon4py.model.common.grid import (
     vertical as v_grid,
 )
 from icon4py.model.common.utils import data_allocation as data_alloc
+from icon4py.model.standalone_driver import config as driver_config
 from icon4py.model.testing import config, data_handling, datatest_utils as dt_utils, definitions
 
 
@@ -96,14 +97,22 @@ def _download_grid_file(grid: definitions.GridDescription) -> pathlib.Path:
 
 
 def get_grid_geometry(
-    backend: gtx_typing.Backend | None, experiment: definitions.Experiment
+    backend: gtx_typing.Backend | None,
+    grid: definitions.GridDescription,
+    experiment_config: driver_config.ExperimentConfig,
 ) -> geometry.GridGeometry:
-    register_name = "_".join((experiment.name, data_alloc.backend_name(backend)))
+    register_name = "_".join(
+        (
+            grid.name,
+            data_alloc.backend_name(backend),
+            str(experiment_config.geometry.use_analytical_means),
+        )
+    )
 
     def _construct_grid_geometry() -> geometry.GridGeometry:
         gm = get_grid_manager_from_identifier(
-            experiment.grid,
-            num_levels=experiment.config.vertical_grid.num_levels,
+            grid,
+            num_levels=experiment_config.vertical_grid.num_levels,
             keep_skip_values=True,
             allocator=model_backends.get_allocator(backend),
         )
@@ -114,6 +123,8 @@ def get_grid_geometry(
             coordinates=gm.coordinates,
             extra_fields=gm.geometry_fields,
             metadata=geometry_attrs.attrs,
+            config=experiment_config.geometry,
+            process_props=decomposition.SingleNodeProcessProperties(),
             exchange=decomposition.single_node_exchange,
         )