From 55f26f24794704dd232e7d3a5d6d0c04d1376432 Mon Sep 17 00:00:00 2001 From: "Philip Mueller, CSCS" Date: Wed, 6 May 2026 11:16:00 +0200 Subject: [PATCH 1/6] Switched to new GPU Codegen. --- pyproject.toml | 2 +- uv.lock | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c364c765d8..cbadfbf213 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -486,7 +486,7 @@ url = 'https://gridtools.github.io/pypi/' atlas4py = {index = "test.pypi"} dace = [ {git = "https://github.com/GridTools/dace", branch = "romanc/stree-v2", group = "dace-cartesian"}, - {index = "gridtools", group = "dace-next"} + {git = "https://github.com/spcl/dace", branch = "new-gpu-codegen-dev", group = "dace-next"} ] # -- versioningit -- diff --git a/uv.lock b/uv.lock index 19aaaa67a8..e358b459ba 100644 --- a/uv.lock +++ b/uv.lock @@ -1244,8 +1244,8 @@ dependencies = [ [[package]] name = "dace" -version = "43!2026.4.27" -source = { registry = "https://gridtools.github.io/pypi/" } +version = "1.0.0" +source = { git = "https://github.com/spcl/dace?branch=new-gpu-codegen-dev#d665388f79a9ce85750ea082ee438e76ce592b05" } resolution-markers = [ "python_full_version >= '3.14' and sys_platform == 'win32'", "python_full_version >= '3.14' and sys_platform == 'emscripten'", @@ -1276,9 +1276,6 @@ dependencies = [ { name = "sympy" }, { name = "typing-extensions" }, ] -wheels = [ - { url = "https://gridtools.github.io/pypi/dace/dace-43!2026.4.27-py3-none-any.whl", hash = "sha256:9098ceed412d287d575b2ed30cc90b754b966eda893698c55129a7bc5bd37d37" }, -] [[package]] name = "debugpy" @@ -1792,7 +1789,7 @@ dace-cartesian = [ { name = "dace", version = "1.0.0", source = { git = "https://github.com/GridTools/dace?branch=romanc%2Fstree-v2#d5fbadb626389e425fac5ed93d2a880811eca41f" } }, ] dace-next = [ - { name = "dace", version = "43!2026.4.27", source = { registry = "https://gridtools.github.io/pypi/" } }, + { name = "dace", version = "1.0.0", source = { git = "https://github.com/spcl/dace?branch=new-gpu-codegen-dev#d665388f79a9ce85750ea082ee438e76ce592b05" } }, ] dev = [ { name = "atlas4py" }, @@ -1962,7 +1959,7 @@ build = [ { name = "wheel", specifier = ">=0.33.6" }, ] dace-cartesian = [{ name = "dace", git = "https://github.com/GridTools/dace?branch=romanc%2Fstree-v2" }] -dace-next = [{ name = "dace", specifier = "==43!2026.4.27", index = "https://gridtools.github.io/pypi/", conflict = { package = "gt4py", group = "dace-next" } }] +dace-next = [{ name = "dace", git = "https://github.com/spcl/dace?branch=new-gpu-codegen-dev" }] dev = [ { name = "atlas4py", specifier = ">=0.41", index = "https://test.pypi.org/simple" }, { name = "coverage", extras = ["toml"], specifier = ">=7.6.1" }, From 574ed87cb85a25e7c1b936727338c978906b008a Mon Sep 17 00:00:00 2001 From: "Philip Mueller, CSCS" Date: Wed, 6 May 2026 11:42:05 +0200 Subject: [PATCH 2/6] Was this the error. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index cbadfbf213..d1c7262353 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ dace-cartesian = [ 'dace>=1.0.2' # refined in [tool.uv.sources] ] dace-next = [ - 'dace==43!2026.04.27' # uses custom index at 'https://github.com/GridTools/pypi' + 'dace==1.0.0' # uses custom index at 'https://github.com/GridTools/pypi' ] dev = [ {include-group = 'build'}, From 7a96e6b0bb06c5345f39b92382af05ba177f77e0 Mon Sep 17 00:00:00 2001 From: "Philip Mueller, CSCS" Date: Wed, 6 May 2026 11:48:55 +0200 Subject: [PATCH 3/6] This should be the thing. --- pyproject.toml | 4 ++-- uv.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d1c7262353..8bfc38aecb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ dace-cartesian = [ 'dace>=1.0.2' # refined in [tool.uv.sources] ] dace-next = [ - 'dace==1.0.0' # uses custom index at 'https://github.com/GridTools/pypi' + 'dace==2.3.4' # uses custom index at 'https://github.com/GridTools/pypi' ] dev = [ {include-group = 'build'}, @@ -486,7 +486,7 @@ url = 'https://gridtools.github.io/pypi/' atlas4py = {index = "test.pypi"} dace = [ {git = "https://github.com/GridTools/dace", branch = "romanc/stree-v2", group = "dace-cartesian"}, - {git = "https://github.com/spcl/dace", branch = "new-gpu-codegen-dev", group = "dace-next"} + {git = "https://github.com/philip-paul-mueller/dace", branch = "phimuell__new-gpu-codegen-dev", group = "dace-next"} ] # -- versioningit -- diff --git a/uv.lock b/uv.lock index e358b459ba..1065704975 100644 --- a/uv.lock +++ b/uv.lock @@ -1244,8 +1244,8 @@ dependencies = [ [[package]] name = "dace" -version = "1.0.0" -source = { git = "https://github.com/spcl/dace?branch=new-gpu-codegen-dev#d665388f79a9ce85750ea082ee438e76ce592b05" } +version = "2.3.4" +source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#877c1027a8fbbaf9e74879aae0719852bd4123dc" } resolution-markers = [ "python_full_version >= '3.14' and sys_platform == 'win32'", "python_full_version >= '3.14' and sys_platform == 'emscripten'", @@ -1789,7 +1789,7 @@ dace-cartesian = [ { name = "dace", version = "1.0.0", source = { git = "https://github.com/GridTools/dace?branch=romanc%2Fstree-v2#d5fbadb626389e425fac5ed93d2a880811eca41f" } }, ] dace-next = [ - { name = "dace", version = "1.0.0", source = { git = "https://github.com/spcl/dace?branch=new-gpu-codegen-dev#d665388f79a9ce85750ea082ee438e76ce592b05" } }, + { name = "dace", version = "2.3.4", source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#877c1027a8fbbaf9e74879aae0719852bd4123dc" } }, ] dev = [ { name = "atlas4py" }, @@ -1959,7 +1959,7 @@ build = [ { name = "wheel", specifier = ">=0.33.6" }, ] dace-cartesian = [{ name = "dace", git = "https://github.com/GridTools/dace?branch=romanc%2Fstree-v2" }] -dace-next = [{ name = "dace", git = "https://github.com/spcl/dace?branch=new-gpu-codegen-dev" }] +dace-next = [{ name = "dace", git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev" }] dev = [ { name = "atlas4py", specifier = ">=0.41", index = "https://test.pypi.org/simple" }, { name = "coverage", extras = ["toml"], specifier = ">=7.6.1" }, From 48a8f1ca8089462aed175e70dd72a84b05650086 Mon Sep 17 00:00:00 2001 From: "Philip Mueller, CSCS" Date: Thu, 7 May 2026 07:55:17 +0200 Subject: [PATCH 4/6] Let's try this fix. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8bfc38aecb..e084ae6092 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ dace-cartesian = [ 'dace>=1.0.2' # refined in [tool.uv.sources] ] dace-next = [ - 'dace==2.3.4' # uses custom index at 'https://github.com/GridTools/pypi' + 'dace==2.3.5' # uses custom index at 'https://github.com/GridTools/pypi' ] dev = [ {include-group = 'build'}, From 6d52e245b9e6960bd50b9d5297ae9c4eb08cf1ea Mon Sep 17 00:00:00 2001 From: "Philip Mueller, CSCS" Date: Thu, 7 May 2026 07:56:44 +0200 Subject: [PATCH 5/6] Let's try this fix. --- uv.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uv.lock b/uv.lock index 1065704975..436decd62d 100644 --- a/uv.lock +++ b/uv.lock @@ -1244,8 +1244,8 @@ dependencies = [ [[package]] name = "dace" -version = "2.3.4" -source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#877c1027a8fbbaf9e74879aae0719852bd4123dc" } +version = "2.3.5" +source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#a62787d92d4ffe3f4586e8be1fdfc4169e791c17" } resolution-markers = [ "python_full_version >= '3.14' and sys_platform == 'win32'", "python_full_version >= '3.14' and sys_platform == 'emscripten'", @@ -1789,7 +1789,7 @@ dace-cartesian = [ { name = "dace", version = "1.0.0", source = { git = "https://github.com/GridTools/dace?branch=romanc%2Fstree-v2#d5fbadb626389e425fac5ed93d2a880811eca41f" } }, ] dace-next = [ - { name = "dace", version = "2.3.4", source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#877c1027a8fbbaf9e74879aae0719852bd4123dc" } }, + { name = "dace", version = "2.3.5", source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#a62787d92d4ffe3f4586e8be1fdfc4169e791c17" } }, ] dev = [ { name = "atlas4py" }, From cc69d9ade89e5ff7ece30cc15127eaed6f2b56a4 Mon Sep 17 00:00:00 2001 From: "Philip Mueller, CSCS" Date: Mon, 11 May 2026 13:23:19 +0200 Subject: [PATCH 6/6] Updated DaCe dependency. --- uv.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/uv.lock b/uv.lock index e7530e7e65..ad17997d6a 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 2 +revision = 3 requires-python = ">=3.10, !=3.13.10, !=3.14.1, <3.15" resolution-markers = [ "python_full_version >= '3.14' and sys_platform == 'win32'", @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "dace" version = "2.3.5" -source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#a62787d92d4ffe3f4586e8be1fdfc4169e791c17" } +source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#28c27de36a387af49c2bf75c25e6a1d257f12d15" } resolution-markers = [ "python_full_version >= '3.14' and sys_platform == 'win32'", "python_full_version >= '3.14' and sys_platform == 'emscripten'", @@ -1789,7 +1789,7 @@ dace-cartesian = [ { name = "dace", version = "1.0.0", source = { git = "https://github.com/GridTools/dace?branch=romanc%2Fstree-v2#d5fbadb626389e425fac5ed93d2a880811eca41f" } }, ] dace-next = [ - { name = "dace", version = "2.3.5", source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#a62787d92d4ffe3f4586e8be1fdfc4169e791c17" } }, + { name = "dace", version = "2.3.5", source = { git = "https://github.com/philip-paul-mueller/dace?branch=phimuell__new-gpu-codegen-dev#28c27de36a387af49c2bf75c25e6a1d257f12d15" } }, ] dev = [ { name = "atlas4py" }, @@ -2306,11 +2306,11 @@ resolution-markers = [ "python_full_version == '3.11.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "jaxlib", version = "0.9.2", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, - { name = "ml-dtypes", marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, - { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, - { name = "opt-einsum", marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, - { name = "scipy", version = "1.17.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "jaxlib", version = "0.9.2", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "ml-dtypes", marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "opt-einsum", marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "scipy", version = "1.17.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, ] sdist = { url = "https://files.pythonhosted.org/packages/92/4c/5aca25abd45fa38dd136e5ae2010376518c67950e1f9408e0c5c93fcf77d/jax-0.9.2.tar.gz", hash = "sha256:42b28017b3e6b57a44b0274cc15f5153239c4873959030399ac1afc009c22365", size = 2662784, upload-time = "2026-03-18T23:28:10.471Z" } wheels = [ @@ -2504,9 +2504,9 @@ resolution-markers = [ "python_full_version == '3.11.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "ml-dtypes", marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, - { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, - { name = "scipy", version = "1.17.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "ml-dtypes", marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "scipy", version = "1.17.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, ] wheels = [ { url = "https://files.pythonhosted.org/packages/b1/2c/0ba08670ab04f6094f0cda4cdc89818946007d0d1dfefa636eab6c7d5392/jaxlib-0.9.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:785f177c3eb78cb7dc797c55ed5c4b6312141845c9a686957e484bacbfce5e88", size = 58762159, upload-time = "2026-03-18T23:26:55.405Z" }, @@ -5073,7 +5073,7 @@ resolution-markers = [ "python_full_version == '3.11.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, + { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-jax-cuda13') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-cuda12' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm6') or (extra == 'extra-5-gt4py-jax-cuda13' and extra == 'extra-5-gt4py-rocm7') or (extra == 'extra-5-gt4py-rocm6' and extra == 'extra-5-gt4py-rocm7') or (extra == 'group-5-gt4py-dace-cartesian' and extra == 'group-5-gt4py-dace-next')" }, ] sdist = { url = "https://files.pythonhosted.org/packages/7a/97/5a3609c4f8d58b039179648e62dd220f89864f56f7357f5d4f45c29eb2cc/scipy-1.17.1.tar.gz", hash = "sha256:95d8e012d8cb8816c226aef832200b1d45109ed4464303e997c5b13122b297c0", size = 30573822, upload-time = "2026-02-23T00:26:24.851Z" } wheels = [