Update GT4Py to v1.1.9 (#1187)

havogt · edopao · web-flow · commit 8fafac62f8c6 · 2026-04-01T16:23:44.000+02:00
Co-authored-by: Edoardo Paone &lt;edoardo.paone@cscs.ch&gt;
diff --git a/ci/base.yml b/ci/base.yml
@@ -85,7 +85,7 @@ build_image_aarch64:
 #   variables:
 #     CSCS_ADDITIONAL_MOUNTS: '["/project/d121/icon4py/ci/testdata:$ICON4PY_TEST_DATA_PATH"]'
 #     HPC_SDK_PATH: "/opt/nvidia/hpc_sdk/Linux_${ARCH}/22.11"
-#     ICON4PY_NOX_UV_CUSTOM_SESSION_EXTRAS: "cuda11"
+#     ICON4PY_NOX_UV_CUSTOM_SESSION_EXTRAS: "cuda12"
 .test_template_aarch64:
   extends: [.container-runner-santis-gh200, .test_template]
   needs: [build_image_aarch64]
diff --git a/model/atmosphere/advection/pyproject.toml b/model/atmosphere/advection/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
   # workspace members
   "icon4py-common~=0.1.0",
   # external dependencies
-  "gt4py==1.1.8",
+  "gt4py==1.1.9",
   'packaging>=20.0'
 ]
 description = "ICON advection."
diff --git a/model/atmosphere/diffusion/pyproject.toml b/model/atmosphere/diffusion/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
   # workspace members
   "icon4py-common~=0.1.0",
   # external dependencies
-  "gt4py==1.1.8",
+  "gt4py==1.1.9",
   'packaging>=20.0'
 ]
 description = "ICON diffusion."
diff --git a/model/atmosphere/dycore/pyproject.toml b/model/atmosphere/dycore/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
   # workspace members
   "icon4py-common~=0.1.0",
   # external dependencies
-  "gt4py==1.1.8",
+  "gt4py==1.1.9",
   'packaging>=20.0'
 ]
 description = "ICON dynamical core."
diff --git a/model/atmosphere/dycore/tests/dycore/stencil_tests/test_compute_advection_in_vertical_momentum_equation.py b/model/atmosphere/dycore/tests/dycore/stencil_tests/test_compute_advection_in_vertical_momentum_equation.py
@@ -76,7 +76,7 @@ def interpolate_contravariant_vertical_velocity_to_full_levels_numpy(
     )
     contravariant_corrected_w_at_cells_on_model_levels = 0.5 * (
         contravariant_corrected_w_with_surface[:, :-1]
-        + contravariant_corrected_w_with_surface[:, 1:]  # type: ignore[operator]  # unclear why mypy complains (might be fixable in gt4py mypy plugin)
+        + contravariant_corrected_w_with_surface[:, 1:]
     )
     return contravariant_corrected_w_at_cells_on_model_levels
 
diff --git a/model/atmosphere/subgrid_scale_physics/microphysics/pyproject.toml b/model/atmosphere/subgrid_scale_physics/microphysics/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
   # workspace members
   "icon4py-common~=0.1.0",
   # external dependencies
-  "gt4py==1.1.8",
+  "gt4py==1.1.9",
   'packaging>=20.0'
 ]
 description = "ICON microphysics."
diff --git a/model/atmosphere/subgrid_scale_physics/muphys/pyproject.toml b/model/atmosphere/subgrid_scale_physics/muphys/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
   "icon4py-common[io]~=0.1.0",
   # external dependencies
   "numpy>=1.23.3",
-  "gt4py==1.1.8",
+  "gt4py==1.1.9",
   "packaging>=20.0"
 ]
 description = "ICON subgrid scale muphys parameterization."
diff --git a/model/common/pyproject.toml b/model/common/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
 ]
 dependencies = [
   'array-api-compat>=1.13.0',
-  'gt4py==1.1.8',
+  'gt4py==1.1.9',
   'packaging>=20.0',
   'typing-extensions>=4.11.0',
   'numpy>=1.23.3',
@@ -41,8 +41,8 @@ version = "0.1.0"
 
 [project.optional-dependencies]
 all = ["icon4py-common[distributed,io]"]
-cuda11 = ['cupy-cuda11x>=13.0', 'gt4py[cuda11]']
 cuda12 = ['cupy-cuda12x>=13.0', 'gt4py[cuda12]']
+cuda13 = ['gt4py[cuda13]']
 distributed = ["ghex>=0.5.1", "mpi4py>=3.1.5"]
 io = [
   # external dependencies
@@ -60,6 +60,7 @@ io = [
   "uxarray==2024.3.0",
   "xarray[complete]>=2024.3.0"
 ]
+rocm7 = ['gt4py[rocm7]']
 
 [project.urls]
 repository = "https://github.com/C2SM/icon4py"
diff --git a/model/common/src/icon4py/model/common/utils/data_allocation.py b/model/common/src/icon4py/model/common/utils/data_allocation.py
@@ -144,11 +144,11 @@ def random_mask(
 ) -> gtx.Field:
     rng = np.random.default_rng()
     shape = _shape(grid, *dims, extend=extend)
-    arr = np.full(shape, False).flatten()
-    num_true = int(arr.size * 0.5)
-    arr[:num_true] = True
-    rng.shuffle(arr)
-    arr = np.reshape(arr, newshape=shape)
+    flat_arr = np.full(shape, False).flatten()
+    num_true = int(flat_arr.size * 0.5)
+    flat_arr[:num_true] = True
+    rng.shuffle(flat_arr)
+    arr = flat_arr.reshape(shape)
     if dtype:
         arr = arr.astype(dtype)
     return gtx.as_field(dims, arr, allocator=allocator)  # type: ignore [arg-type] # type "ndarray[Any, Any] | NDArrayObject"; expected "NDArrayObject"
diff --git a/model/driver/pyproject.toml b/model/driver/pyproject.toml
@@ -31,7 +31,7 @@ dependencies = [
   # external dependencies
   "click>=8.0.1",
   "devtools>=0.12",
-  "gt4py==1.1.8",
+  "gt4py==1.1.9",
   "packaging>=20.0",
   "numpy>=1.23.3"
 ]
diff --git a/model/standalone_driver/pyproject.toml b/model/standalone_driver/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
   "typer>=0.20.0",
   "pytest",
   "devtools>=0.12",
-  "gt4py==1.1.8",
+  "gt4py==1.1.9",
   "packaging>=20.0",
   "numpy>=1.23.3"
 ]
diff --git a/model/standalone_driver/src/icon4py/model/standalone_driver/standalone_driver.py b/model/standalone_driver/src/icon4py/model/standalone_driver/standalone_driver.py
@@ -292,7 +292,7 @@ def _adjust_ndyn_substeps_var(
 
         if (
             global_max_vertical_cfl
-            > driver_constants.CFL_ENTER_WATCHMODE_FACTOR * self.config.vertical_cfl_threshold  # type: ignore[operator]
+            > driver_constants.CFL_ENTER_WATCHMODE_FACTOR * self.config.vertical_cfl_threshold  # type: ignore[operator] # problem with ScalarLikeArray
             and not self.model_time_variables.cfl_watch_mode
         ):
             log.warning(
@@ -305,8 +305,8 @@ def _adjust_ndyn_substeps_var(
                 self.model_time_variables.ndyn_substeps_var / self.config.ndyn_substeps
             )
             if (
-                global_max_vertical_cfl * substep_fraction  # type: ignore[operator] # problem with ScalarLikeArray
-                > driver_constants.CFL_THRESHOLD_FACTOR * self.config.vertical_cfl_threshold
+                global_max_vertical_cfl * substep_fraction
+                > driver_constants.CFL_THRESHOLD_FACTOR * self.config.vertical_cfl_threshold  # type: ignore[operator] # problem with ScalarLikeArray
             ):
                 log.warning(
                     f"Maximum vertical CFL number {global_max_vertical_cfl} is close to critical threshold"
@@ -322,8 +322,8 @@ def _adjust_ndyn_substeps_var(
                     ndyn_substeps_increment = max(
                         1,
                         round(
-                            self.model_time_variables.ndyn_substeps_var
-                            * (global_max_vertical_cfl - vertical_cfl_threshold_for_increment)  # type: ignore[operator] # problem with ScalarLikeArray
+                            self.model_time_variables.ndyn_substeps_var  # type: ignore[arg-type] # problem with ScalarLikeArray
+                            * (global_max_vertical_cfl - vertical_cfl_threshold_for_increment)
                             / vertical_cfl_threshold_for_increment
                         ),
                     )
@@ -344,11 +344,11 @@ def _adjust_ndyn_substeps_var(
             if (
                 self.model_time_variables.ndyn_substeps_var > self.config.ndyn_substeps
                 and global_max_vertical_cfl
-                * ta.wpfloat(  # type: ignore[operator] # problem with ScalarLikeArray
+                * ta.wpfloat(
                     self.model_time_variables.ndyn_substeps_var
                     / (self.model_time_variables.ndyn_substeps_var - 1)
                 )
-                < vertical_cfl_threshold_for_decrement
+                < vertical_cfl_threshold_for_decrement  # type: ignore[operator] # problem with ScalarLikeArray
             ):
                 self.model_time_variables.update_ndyn_substeps(
                     self.model_time_variables.ndyn_substeps_var - 1
diff --git a/model/testing/pyproject.toml b/model/testing/pyproject.toml
@@ -27,7 +27,7 @@ dependencies = [
   'icon4py-common[io]~=0.1.0',
   # external dependencies
   "filelock>=3.18.0",
-  "gt4py==1.1.8",
+  "gt4py==1.1.9",
   "numpy>=1.23.3",
   'packaging>=20.0',
   "pytest>=8.0.1",
diff --git a/pyproject.toml b/pyproject.toml
@@ -97,12 +97,13 @@ version = "0.1.0"
 
 [project.optional-dependencies]
 all = ["icon4py[distributed,fortran,io,testing,profiling]"]
-cuda11 = ["icon4py-common[cuda11]"]
 cuda12 = ["icon4py-common[cuda12]"]
+cuda13 = ["icon4py-common[cuda13]"]
 distributed = ["icon4py-common[distributed]"]
 fortran = ["icon4py-tools~=0.1.0"]
 io = ["icon4py-common[io]"]
 profiling = ['viztracer>=1.1.0']
+rocm7 = ["icon4py-common[rocm7]"]
 testing = ["icon4py-testing"]
 
 [project.urls]
@@ -364,7 +365,7 @@ packages = []
 
 # -- uv: packages & workspace --
 [tool.uv]
-conflicts = [[{extra = "cuda11"}, {extra = "cuda12"}]]
+conflicts = [[{extra = "cuda12"}, {extra = "cuda13"}, {extra = "rocm7"}]]
 
 [[tool.uv.index]]
 explicit = true
diff --git a/tools/pyproject.toml b/tools/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
   # external dependencies
   'clang-format>=22.1.0',
   'cffi>=1.5',
-  'gt4py==1.1.8',
+  'gt4py==1.1.9',
   "numpy>=1.23.3",
   'packaging>=20.0',
   'click>=8.1.7',
@@ -48,9 +48,10 @@ requires-python = '>=3.10'
 version = "0.1.0"
 
 [project.optional-dependencies]
-cuda11 = ['cupy-cuda11x>=13.0', 'gt4py[cuda11]']
-cuda12 = ['cupy-cuda12x>=13.0', 'gt4py[cuda12]']
+cuda12 = ['icon4py-common[cuda12]']
+cuda13 = ['icon4py-common[cuda13]']
 profiling = ['viztracer>=1.1.0']
+rocm7 = ["icon4py-common[rocm7]"]
 
 [project.scripts]
 py2fgen = 'icon4py.tools.py2fgen._cli:main'
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ dependencies = [`
`26`	`26`	`# workspace members`
`27`	`27`	`"icon4py-common~=0.1.0",`
`28`	`28`	`# external dependencies`
`29`		`- "gt4py==1.1.8",`
	`29`	`+ "gt4py==1.1.9",`
`30`	`30`	`'packaging>=20.0'`
`31`	`31`	`]`
`32`	`32`	`description = "ICON advection."`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ def interpolate_contravariant_vertical_velocity_to_full_levels_numpy(`
`76`	`76`	`)`
`77`	`77`	`contravariant_corrected_w_at_cells_on_model_levels = 0.5 * (`
`78`	`78`	`contravariant_corrected_w_with_surface[:, :-1]`
`79`		`- + contravariant_corrected_w_with_surface[:, 1:] # type: ignore[operator] # unclear why mypy complains (might be fixable in gt4py mypy plugin)`
	`79`	`+ + contravariant_corrected_w_with_surface[:, 1:]`
`80`	`80`	`)`
`81`	`81`	`return contravariant_corrected_w_at_cells_on_model_levels`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ dependencies = [`
`31`	`31`	`# external dependencies`
`32`	`32`	`"click>=8.0.1",`
`33`	`33`	`"devtools>=0.12",`
`34`		`- "gt4py==1.1.8",`
	`34`	`+ "gt4py==1.1.9",`
`35`	`35`	`"packaging>=20.0",`
`36`	`36`	`"numpy>=1.23.3"`
`37`	`37`	`]`