Muphys: staging branch #1009

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.

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

Draft

edopao wants to merge 8 commits into muphys_bug_fix from muphys_bug_fix_staging

model/atmosphere/advection/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ dependencies = [ @@
       # workspace members
       "icon4py-common>=0.0.6",
       # external dependencies
-      "gt4py==1.1.3",
+      "gt4py==1.1.4",
       'packaging>=20.0'
     ]
     description = "ICON advection."
@@ Expand Down @@

model/atmosphere/diffusion/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ dependencies = [ @@
       # workspace members
       "icon4py-common>=0.0.6",
       # external dependencies
-      "gt4py==1.1.3",
+      "gt4py==1.1.4",
       'packaging>=20.0'
     ]
     description = "ICON diffusion."
@@ Expand Down @@

model/atmosphere/dycore/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ dependencies = [ @@
       # workspace members
       "icon4py-common>=0.0.6",
       # external dependencies
-      "gt4py==1.1.3",
+      "gt4py==1.1.4",
       'packaging>=20.0'
     ]
     description = "ICON dynamical core."
@@ Expand Down @@

model/atmosphere/subgrid_scale_physics/microphysics/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ dependencies = [ @@
       # workspace members
       "icon4py-common>=0.0.6",
       # external dependencies
-      "gt4py==1.1.3",
+      "gt4py==1.1.4",
       'packaging>=20.0'
     ]
     description = "ICON microphysics."
@@ Expand Down @@

model/atmosphere/subgrid_scale_physics/muphys/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,8 +25,7 @@ dependencies = [ @@
       # workspace members
       "icon4py-common[io]>=0.0.6",
       # external dependencies
-      "numpy>=1.23.3",
-      "gt4py==1.1.3",
+      "gt4py==1.1.4",
       "packaging>=20.0"
     ]
     description = "ICON subgrid scale muphys parameterization."
@@ Expand Down @@

...phys/src/icon4py/model/atmosphere/subgrid_scale_physics/muphys/driver/run_graupel_only.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,8 @@ @@
     import time
     from gt4py import next as gtx
-    from gt4py.next import config as gtx_config, metrics as gtx_metrics
+    from gt4py.next import config as gtx_config
+    from gt4py.next.instrumentation import metrics as gtx_metrics
     from icon4py.model.atmosphere.subgrid_scale_physics.muphys.driver import common, utils
     from icon4py.model.atmosphere.subgrid_scale_physics.muphys.implementations import graupel
@@ Expand Down @@

model/common/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ classifiers = [ @@
       'Topic :: Scientific/Engineering :: Physics'
     ]
     dependencies = [
-      'gt4py==1.1.3',
+      'gt4py==1.1.4',
       'packaging>=20.0',
       'typing-extensions>=4.11.0',
       'numpy>=1.23.3',
@@ Expand Down @@

model/common/src/icon4py/model/common/model_options.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ def get_dace_options( @@
             backend_descriptor["use_zero_origin"] = True
             optimization_args["gpu_memory_pool"] = False
             optimization_args["make_persistent"] = True
+            optimization_args["fuse_tasklets"] = True
         if optimization_hooks:
             optimization_args["optimization_hooks"] = optimization_hooks
         if optimization_args:
@@ Expand Down @@

model/driver/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ dependencies = [ @@
       # external dependencies
       "click>=8.0.1",
       "devtools>=0.12",
-      "gt4py==1.1.3",
+      "gt4py==1.1.4",
       "packaging>=20.0",
       "numpy>=1.23.3"
     ]
@@ Expand Down @@

model/driver/src/icon4py/model/driver/icon4py_configuration.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
     import functools
     import logging
-    from gt4py.next import metrics as gtx_metrics
+    from gt4py.next.instrumentation import metrics as gtx_metrics
     from icon4py.model.atmosphere.diffusion import diffusion
     from icon4py.model.atmosphere.dycore import dycore_states, solve_nonhydro as solve_nh
@@ Expand Down @@

model/driver/src/icon4py/model/driver/icon4py_driver.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,8 @@ @@
     import click
     import numpy as np
     from devtools import Timer
-    from gt4py.next import config as gtx_config, metrics as gtx_metrics, typing as gtx_typing
+    from gt4py.next import config as gtx_config, typing as gtx_typing
+    from gt4py.next.instrumentation import metrics as gtx_metrics
     import icon4py.model.common.utils as common_utils
     from icon4py.model.atmosphere.diffusion import diffusion, diffusion_states
@@ Expand Down @@

model/standalone_driver/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ dependencies = [ @@
       # external dependencies
       "typer>=0.20.0",
       "devtools>=0.12",
-      "gt4py==1.1.3",
+      "gt4py==1.1.4",
       "packaging>=20.0",
       "numpy>=1.23.3"
     ]
@@ Expand Down @@

model/standalone_driver/src/icon4py/model/standalone_driver/config.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
     import datetime
     import pathlib
-    from gt4py.next import metrics as gtx_metrics
+    from gt4py.next.instrumentation import metrics as gtx_metrics
     from icon4py.model.common import type_alias as ta
@@ Expand Down @@

model/standalone_driver/src/icon4py/model/standalone_driver/standalone_driver.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,8 @@ @@
     from collections.abc import Callable
     import gt4py.next as gtx
-    from gt4py.next import config as gtx_config, metrics as gtx_metrics
+    from gt4py.next import config as gtx_config
+    from gt4py.next.instrumentation import metrics as gtx_metrics
     import icon4py.model.common.utils as common_utils
     from icon4py.model.atmosphere.diffusion import diffusion, diffusion_states
@@ Expand Down @@

model/testing/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ dependencies = [ @@
       'icon4py-common[io]>=0.0.6',
       # external dependencies
       "filelock>=3.18.0",
-      "gt4py==1.1.3",
+      "gt4py==1.1.4",
       "numpy>=1.23.3",
       'packaging>=20.0',
       "pytest>=8.0.1",
@@ Expand Down @@

model/testing/src/icon4py/model/testing/stencil_tests.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,13 +20,13 @@ @@
     from gt4py.next import (
         config as gtx_config,
         constructors,
-        metrics as gtx_metrics,
         named_collections as gtx_named_collections,
         typing as gtx_typing,
     )
     # TODO(havogt): import will disappear after FieldOperators support `.compile`
     from gt4py.next.ffront.decorator import FieldOperator
+    from gt4py.next.instrumentation import metrics as gtx_metrics
     from icon4py.model.common import model_backends, model_options
     from icon4py.model.common.grid import base
@@ Expand Down @@

pyproject.toml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -362,7 +362,7 @@ url = 'https://gridtools.github.io/pypi/'
  
    [tool.uv.sources]

    dace = {index = "gridtools"}

    ghex = {git = "https://github.com/msimberg/GHEX.git", branch = "async-mpi"}

    # gt4py = {git = "https://github.com/GridTools/gt4py", branch = "main"}

    gt4py = {git = "https://github.com/GridTools/gt4py", branch = "muphys_staging"}

    # gt4py = {index = "test.pypi"}

    icon4py-atmosphere-advection = {workspace = true}

    icon4py-atmosphere-diffusion = {workspace = true}

tools/pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ dependencies = [ @@
       'icon4py-common>=0.0.6',
       # external dependencies
       'cffi>=1.5',
-      'gt4py==1.1.3',
+      'gt4py==1.1.4',
       "numpy>=1.23.3",
       'packaging>=20.0',
       'click>=8.1.7',
@@ Expand Down @@

tools/src/icon4py/tools/py2fgen/wrappers/dycore_wrapper.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,8 @@ @@
     import gt4py.next as gtx
     import numpy as np
-    from gt4py.next import config as gtx_config, metrics as gtx_metrics
+    from gt4py.next import config as gtx_config
+    from gt4py.next.instrumentation import metrics as gtx_metrics
     from gt4py.next.type_system import type_specifications as ts
     from icon4py.model.atmosphere.dycore import dycore_states, solve_nonhydro
@@ Expand Down @@

uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Muphys: staging branch #1009

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Muphys: staging branch #1009

Are you sure you want to change the base?

Uh oh!

Muphys: staging branch #1009

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!