From 4ce2cbe86b60a0a545b6709e3c1ed6522b34c3a6 Mon Sep 17 00:00:00 2001 From: Philip Mueller Date: Wed, 30 Apr 2025 08:29:16 +0200 Subject: [PATCH 1/2] DaCe is now pulled from the integration branch. The downside is that it is my personal fork. --- pyproject.toml | 2 +- uv.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b5925be4b5..3cd2ba7989 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -434,7 +434,7 @@ url = 'https://test.pypi.org/simple/' [tool.uv.sources] atlas4py = {index = "test.pypi"} -dace = {git = "https://github.com/spcl/dace", branch = "main", extra = "dace-next"} +dace = {git = "https://github.com/philip-paul-mueller/dace", branch = "gt4py-next-integration", extra = "dace-next"} # -- versioningit -- [tool.versioningit] diff --git a/uv.lock b/uv.lock index 3748f9b0d9..06f61181bb 100644 --- a/uv.lock +++ b/uv.lock @@ -663,7 +663,7 @@ wheels = [ [[package]] name = "dace" version = "1.0.0" -source = { git = "https://github.com/spcl/dace?branch=main#9c67b4c6fe02a3248fcc25c6686715988e9db015" } +source = { git = "https://github.com/philip-paul-mueller/dace?branch=gt4py-next-integration#e537d2841cd70d7b055129a8e63304913c453e81" } resolution-markers = [ "python_full_version >= '3.11'", "python_full_version < '3.11'", @@ -1081,7 +1081,7 @@ dace = [ { name = "dace", version = "1.0.2", source = { registry = "https://pypi.org/simple" } }, ] dace-next = [ - { name = "dace", version = "1.0.0", source = { git = "https://github.com/spcl/dace?branch=main#9c67b4c6fe02a3248fcc25c6686715988e9db015" } }, + { name = "dace", version = "1.0.0", source = { git = "https://github.com/philip-paul-mueller/dace?branch=gt4py-next-integration#e537d2841cd70d7b055129a8e63304913c453e81" } }, ] formatting = [ { name = "clang-format" }, @@ -1204,7 +1204,7 @@ requires-dist = [ { name = "cupy-rocm-5-0", marker = "extra == 'rocm5-0'", specifier = ">=13.3.0" }, { name = "cytoolz", specifier = ">=0.12.1" }, { name = "dace", marker = "extra == 'dace'", specifier = ">=1.0.2,<1.1.0" }, - { name = "dace", marker = "extra == 'dace-next'", git = "https://github.com/spcl/dace?branch=main" }, + { name = "dace", marker = "extra == 'dace-next'", git = "https://github.com/philip-paul-mueller/dace?branch=gt4py-next-integration" }, { name = "deepdiff", specifier = ">=5.6.0" }, { name = "devtools", specifier = ">=0.6" }, { name = "diskcache", specifier = ">=5.6.3" }, From 5b7df1608b3030477185ab6a59bf4b668bc6e38f Mon Sep 17 00:00:00 2001 From: Philip Mueller Date: Wed, 30 Apr 2025 12:10:34 +0200 Subject: [PATCH 2/2] Switched to our fork of DaCe. --- pyproject.toml | 2 +- uv.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3cd2ba7989..078bb5a6b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -434,7 +434,7 @@ url = 'https://test.pypi.org/simple/' [tool.uv.sources] atlas4py = {index = "test.pypi"} -dace = {git = "https://github.com/philip-paul-mueller/dace", branch = "gt4py-next-integration", extra = "dace-next"} +dace = {git = "https://github.com/GridTools/dace", branch = "gt4py-next-integration", extra = "dace-next"} # -- versioningit -- [tool.versioningit] diff --git a/uv.lock b/uv.lock index 06f61181bb..8f87a87113 100644 --- a/uv.lock +++ b/uv.lock @@ -663,7 +663,7 @@ wheels = [ [[package]] name = "dace" version = "1.0.0" -source = { git = "https://github.com/philip-paul-mueller/dace?branch=gt4py-next-integration#e537d2841cd70d7b055129a8e63304913c453e81" } +source = { git = "https://github.com/GridTools/dace?branch=gt4py-next-integration#7fcf8f9dc774f91ef20f1e9887a27bcfde874c66" } resolution-markers = [ "python_full_version >= '3.11'", "python_full_version < '3.11'", @@ -1081,7 +1081,7 @@ dace = [ { name = "dace", version = "1.0.2", source = { registry = "https://pypi.org/simple" } }, ] dace-next = [ - { name = "dace", version = "1.0.0", source = { git = "https://github.com/philip-paul-mueller/dace?branch=gt4py-next-integration#e537d2841cd70d7b055129a8e63304913c453e81" } }, + { name = "dace", version = "1.0.0", source = { git = "https://github.com/GridTools/dace?branch=gt4py-next-integration#7fcf8f9dc774f91ef20f1e9887a27bcfde874c66" } }, ] formatting = [ { name = "clang-format" }, @@ -1204,7 +1204,7 @@ requires-dist = [ { name = "cupy-rocm-5-0", marker = "extra == 'rocm5-0'", specifier = ">=13.3.0" }, { name = "cytoolz", specifier = ">=0.12.1" }, { name = "dace", marker = "extra == 'dace'", specifier = ">=1.0.2,<1.1.0" }, - { name = "dace", marker = "extra == 'dace-next'", git = "https://github.com/philip-paul-mueller/dace?branch=gt4py-next-integration" }, + { name = "dace", marker = "extra == 'dace-next'", git = "https://github.com/GridTools/dace?branch=gt4py-next-integration" }, { name = "deepdiff", specifier = ">=5.6.0" }, { name = "devtools", specifier = ">=0.6" }, { name = "diskcache", specifier = ">=5.6.3" },