Skip to content

WIP: build: different dace versions based on the catesian/dace extra #2716

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.

Sign up for GitHub

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

Draft
romanc wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

WIP: build: different dace versions based on the catesian/dace extra #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1618734
build: distinguish dace version based on cartesian/dace extra
romanc Jul 23, 2026
5c1c5e0
'jax' extra is included in catesian & dace extra
romanc Jul 23, 2026
f919372
all gpu extras conflict each other
romanc Jul 23, 2026
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
11 changes: 4 additions & 7 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
codegen: nox.param(codegen, id=codegen, tags=[codegen]) for codegen in CodeGenOption.__args__
}
CodeGenTestSettings: Final[dict[str, dict[str, list[str]]]] = {
"internal": {"extras": ["jax"], "markers": ["not requires_dace"]}
"internal": {"extras": [], "markers": ["not requires_dace"]}
}
CodeGenDaceTestSettings = CodeGenTestSettings | {
"dace": {"extras": [], "markers": ["requires_dace"]},
Expand Down Expand Up @@ -170,8 +170,7 @@ def test_cartesian(
codegen_settings = CodeGenDaceTestSettings[codegen]
device_settings = DeviceTestSettings[device]
extras = [
"standard",
"testing",
"cartesian",
*codegen_settings.get("extras", []),
*device_settings.get("extras", []),
]
Expand Down Expand Up @@ -253,8 +252,7 @@ def test_next(
codegen_settings = CodeGenDaceTestSettings[codegen]
device_settings = DeviceTestSettings[device]
extras = [
"standard",
"testing",
"next",
*codegen_settings.get("extras", []),
*device_settings.get("extras", []),
]
Expand Down Expand Up @@ -388,8 +386,7 @@ def test_next_dace_determinism(
codegen_settings = CodeGenDaceTestSettings["dace"]
device_settings = DeviceTestSettings[device]
extras = [
"standard",
"testing",
"next",
*codegen_settings.get("extras", []),
*device_settings.get("extras", []),
]
Expand Down
9 changes: 8 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ dependencies = [
'click>=8.0.0',
'cmake>=3.22',
'cytoolz>=1.0.1',
'dace>=2.0.0a4',
'dace @ git+https://github.com/romanc/dace.git@gmao-visit ; extra == "cartesian"',
'dace>=2.0.0a4 ; extra == "next"',
'deepdiff>=8.1.0',
'devtools>=0.6',
'factory-boy>=3.3.3',
Expand Down Expand Up @@ -457,9 +458,15 @@ find = {namespaces = false, where = ['src']}
conflicts = [
[
{extra = 'cuda12'},
{extra = 'cuda13'},
{extra = 'jax-cuda12'},
{extra = 'jax-cuda13'},
{extra = 'rocm6'},
{extra = 'rocm7'}
],
[
{extra = 'cartesian'},
{extra = 'next'}
]
]
default-groups = ["dev"]
Expand Down
Loading
Loading