From e559212ec195ac7f94f6261abb798adadb29bfc9 Mon Sep 17 00:00:00 2001 From: Magdalena Luz Date: Wed, 12 Nov 2025 10:40:35 +0100 Subject: [PATCH] change GHEX to latest release version on PyPI, set ghex github master in uv.sources --- model/common/pyproject.toml | 2 +- pyproject.toml | 2 +- uv.lock | 23 +++++++++++------------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/model/common/pyproject.toml b/model/common/pyproject.toml index c70252e3c3..ffb4f7d2c1 100644 --- a/model/common/pyproject.toml +++ b/model/common/pyproject.toml @@ -42,7 +42,7 @@ version = "0.0.6" all = ["icon4py-common[distributed,io]"] cuda11 = ['cupy-cuda11x>=13.0', 'gt4py[cuda11]'] cuda12 = ['cupy-cuda12x>=13.0', 'gt4py[cuda12]'] -distributed = ["ghex>=0.3.0", "mpi4py>=3.1.5"] +distributed = ["ghex>=0.4.1", "mpi4py>=3.1.5"] io = [ # external dependencies "cartopy>=0.22.0", diff --git a/pyproject.toml b/pyproject.toml index 8cd4f7a6ef..5d4be0bebe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -318,7 +318,7 @@ url = "https://test.pypi.org/simple/" [tool.uv.sources] dace = {git = "https://github.com/GridTools/dace", tag = "__gt4py-next-integration_2025_11_05"} -# ghex = {git = "https://github.com/ghex-org/GHEX.git", branch = "master"} +ghex = {git = "https://github.com/ghex-org/GHEX.git", branch = "master"} # gt4py = {git = "https://github.com/GridTools/gt4py", branch = "main"} # gt4py = {index = "test.pypi"} icon4py-atmosphere-advection = {workspace = true} diff --git a/uv.lock b/uv.lock index 5889f36141..9a9dee7d30 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 2 +revision = 3 requires-python = ">=3.10" resolution-markers = [ "python_full_version < '3.11'", @@ -173,8 +173,8 @@ dependencies = [ { name = "packaging" }, { name = "pathspec" }, { name = "platformdirs" }, - { name = "tomli", marker = "python_full_version < '3.11'" }, - { name = "typing-extensions", marker = "python_full_version < '3.11'" }, + { name = "tomli", marker = "python_full_version < '3.11' or (extra == 'extra-7-icon4py-cuda11' and extra == 'extra-7-icon4py-cuda12')" }, + { name = "typing-extensions", marker = "python_full_version < '3.11' or (extra == 'extra-7-icon4py-cuda11' and extra == 'extra-7-icon4py-cuda12')" }, ] sdist = { url = "https://files.pythonhosted.org/packages/d8/0d/cc2fb42b8c50d80143221515dd7e4766995bd07c56c9a3ed30baf080b6dc/black-24.10.0.tar.gz", hash = "sha256:846ea64c97afe3bc677b761787993be4991810ecc7a4a937816dd6bddedc4875", size = 645813, upload-time = "2024-10-07T19:20:50.361Z" } wheels = [ @@ -562,7 +562,7 @@ name = "click" version = "8.1.7" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "colorama", marker = "sys_platform == 'win32' or (extra == 'extra-7-icon4py-cuda11' and extra == 'extra-7-icon4py-cuda12')" }, ] sdist = { url = "https://files.pythonhosted.org/packages/96/d3/f04c7bfcf5c1862a2a5b845c6b2b360488cf47af55dfa79c98f6a6bf98b5/click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de", size = 336121, upload-time = "2023-08-17T17:29:11.868Z" } wheels = [ @@ -917,7 +917,7 @@ dependencies = [ { name = "numpy" }, { name = "packaging" }, { name = "ply" }, - { name = "pyreadline", marker = "sys_platform == 'win32'" }, + { name = "pyreadline", marker = "sys_platform == 'win32' or (extra == 'extra-7-icon4py-cuda11' and extra == 'extra-7-icon4py-cuda12')" }, { name = "pyyaml" }, { name = "sympy" }, ] @@ -1352,13 +1352,12 @@ wheels = [ [[package]] name = "ghex" -version = "0.4.0" -source = { registry = "https://pypi.org/simple" } +version = "0.4.1" +source = { git = "https://github.com/ghex-org/GHEX.git?branch=master#c4575aa89350fbf30d6d3707f32076d66b6b7eb0" } dependencies = [ { name = "mpi4py" }, { name = "numpy" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/d4/4f/d6217b2afcecff78620c8d3df315b3a354820447ad48962889fe029a3b2c/ghex-0.4.0.tar.gz", hash = "sha256:65135fee88a0bea16bbcc6a48fda9065850db7af4340726c0ea804affed04890", size = 8309041, upload-time = "2024-12-18T14:40:05.407Z" } [[package]] name = "gitdb" @@ -1655,7 +1654,7 @@ requires-dist = [ { name = "icon4py-tools", marker = "extra == 'fortran'", editable = "tools" }, { name = "viztracer", marker = "extra == 'profiling'", specifier = ">=1.1.0" }, ] -provides-extras = ["all", "cuda11", "cuda12", "distributed", "fortran", "io", "testing", "profiling"] +provides-extras = ["all", "cuda11", "cuda12", "distributed", "fortran", "io", "profiling", "testing"] [package.metadata.requires-dev] build = [ @@ -1881,7 +1880,7 @@ requires-dist = [ { name = "cupy-cuda12x", marker = "extra == 'cuda12'", specifier = ">=13.0" }, { name = "dace", git = "https://github.com/GridTools/dace?tag=__gt4py-next-integration_2025_11_05" }, { name = "datashader", marker = "extra == 'io'", specifier = ">=0.16.1" }, - { name = "ghex", marker = "extra == 'distributed'", specifier = ">=0.3.0" }, + { name = "ghex", marker = "extra == 'distributed'", git = "https://github.com/ghex-org/GHEX.git?branch=master" }, { name = "gt4py", specifier = "==1.1.0" }, { name = "gt4py", extras = ["cuda11"], marker = "extra == 'cuda11'" }, { name = "gt4py", extras = ["cuda12"], marker = "extra == 'cuda12'" }, @@ -3944,7 +3943,7 @@ source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "packaging" }, { name = "setuptools" }, - { name = "tomli", marker = "python_full_version < '3.11'" }, + { name = "tomli", marker = "python_full_version < '3.11' or (extra == 'extra-7-icon4py-cuda11' and extra == 'extra-7-icon4py-cuda12')" }, ] sdist = { url = "https://files.pythonhosted.org/packages/4f/a4/00a9ac1b555294710d4a68d2ce8dfdf39d72aa4d769a7395d05218d88a42/setuptools_scm-8.1.0.tar.gz", hash = "sha256:42dea1b65771cba93b7a515d65a65d8246e560768a66b9106a592c8e7f26c8a7", size = 76465, upload-time = "2024-05-06T15:07:56.934Z" } wheels = [ @@ -4569,7 +4568,7 @@ version = "3.1.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "packaging" }, - { name = "tomli", marker = "python_full_version < '3.11'" }, + { name = "tomli", marker = "python_full_version < '3.11' or (extra == 'extra-7-icon4py-cuda11' and extra == 'extra-7-icon4py-cuda12')" }, ] sdist = { url = "https://files.pythonhosted.org/packages/5c/9b/941647e9e3616b5da7bbc4601ed9920f44a886704100fa8151406c07c149/versioningit-3.1.2.tar.gz", hash = "sha256:4db83ed99f56b07d83940bee3445ca46ca120d13b6b304cdb5fb44e5aa4edec0", size = 213047, upload-time = "2024-07-20T12:41:07.927Z" } wheels = [