Skip to content
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

build[next]: rollback gt4py-next to dace 1.0.0, keep cartesian on dace 1.0.1 #1836

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:

- repo: https://github.com/astral-sh/uv-pre-commit
# uv version.
rev: 0.5.10
rev: 0.5.25
hooks:
- id: uv-lock

Expand Down
6 changes: 5 additions & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
"internal": {"extras": [], "markers": ["not requires_dace"]},
"dace": {"extras": ["dace"], "markers": ["requires_dace"]},
}
# Use dace-next for GT4Py-next, to install a different dace version than in cartesian
CodeGenNextTestSettings = CodeGenTestSettings | {
"dace": {"extras": ["dace-next"], "markers": ["requires_dace"]},
}


# -- nox sessions --
Expand Down Expand Up @@ -158,7 +162,7 @@ def test_next(
) -> None:
"""Run selected 'gt4py.next' tests."""

codegen_settings = CodeGenTestSettings[codegen]
codegen_settings = CodeGenNextTestSettings[codegen]
device_settings = DeviceTestSettings[device]
groups: list[str] = ["test"]
mesh_markers: list[str] = []
Expand Down
11 changes: 10 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ all = ['gt4py[dace,formatting,jax,performance,testing]']
cuda11 = ['cupy-cuda11x>=12.0']
cuda12 = ['cupy-cuda12x>=12.0']
# features
dace = ['dace>=1.0.0,<1.1.0'] # v1.x will contain breaking changes, see https://github.com/spcl/dace/milestone/4
dace = ['dace>=1.0.1,<1.1.0'] # v1.x will contain breaking changes, see https://github.com/spcl/dace/milestone/4
dace-next = ['dace==1.0.0'] # TODO(edopao): pull latest dace version from the git repository
formatting = ['clang-format>=9.0']
jax = ['jax>=0.4.26']
jax-cuda12 = ['jax[cuda12_local]>=0.4.26', 'gt4py[cuda12]']
Expand Down Expand Up @@ -438,6 +439,14 @@ conflicts = [
{extra = 'jax-cuda12'},
{extra = 'rocm4_3'},
{extra = 'rocm5_0'}
],
[
{extra = 'dace'},
{extra = 'dace-next'}
],
[
{extra = 'all'},
{extra = 'dace-next'}
]
]

Expand Down
Loading