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.

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

build: Bump DaCe 1.0.0 -> 1.0.1 #1820

Closed
wants to merge 2 commits into from
Closed

build: Bump DaCe 1.0.0 -> 1.0.1 #1820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
420b2ba
Bump DaCe 1.0.0 -> 1.0.1
romanc Jan 23, 2025
285febb
running new ruff version
romanc Jan 23, 2025
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
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ repos:
## version = re.search('ruff==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"rev: v{version}")
##]]]
rev: v0.8.6
rev: v0.9.2
##[[[end]]]
hooks:
# Run the linter.
Expand Down Expand Up @@ -95,13 +95,13 @@ repos:
- boltons==24.1.0
- cached-property==2.0.1
- click==8.1.8
- cmake==3.31.2
- cmake==3.31.4
- cytoolz==1.0.1
- deepdiff==8.1.1
- devtools==0.12.2
- diskcache==5.6.3
- factory-boy==3.3.1
- filelock==3.16.1
- filelock==3.17.0
- frozendict==2.4.6
- gridtools-cpp==2.3.8
- jinja2==3.1.5
Expand Down
50 changes: 25 additions & 25 deletions constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ bracex==2.5.post1 # via wcmatch
build==1.2.2.post1 # via pip-tools
bump-my-version==0.29.0 # via -r requirements-dev.in
cached-property==2.0.1 # via gt4py (pyproject.toml)
cachetools==5.5.0 # via tox
cachetools==5.5.1 # via tox
certifi==2024.12.14 # via requests
cfgv==3.4.0 # via pre-commit
chardet==5.2.0 # via tox
charset-normalizer==3.4.1 # via requests
clang-format==19.1.6 # via -r requirements-dev.in, gt4py (pyproject.toml)
clang-format==19.1.7 # via -r requirements-dev.in, gt4py (pyproject.toml)
click==8.1.8 # via black, bump-my-version, gt4py (pyproject.toml), pip-tools, rich-click
cmake==3.31.2 # via gt4py (pyproject.toml)
cmake==3.31.4 # via gt4py (pyproject.toml)
cogapp==3.4.1 # via -r requirements-dev.in
colorama==0.4.6 # via tox
comm==0.2.2 # via ipykernel
contourpy==1.3.1 # via matplotlib
coverage==7.6.10 # via -r requirements-dev.in, pytest-cov
cycler==0.12.1 # via matplotlib
cytoolz==1.0.1 # via gt4py (pyproject.toml)
dace==1.0.0 # via gt4py (pyproject.toml)
dace==1.0.1 # via gt4py (pyproject.toml)
darglint==1.8.1 # via -r requirements-dev.in
debugpy==1.8.11 # via ipykernel
debugpy==1.8.12 # via ipykernel
decorator==5.1.1 # via ipython
deepdiff==8.1.1 # via gt4py (pyproject.toml)
devtools==0.12.2 # via gt4py (pyproject.toml)
Expand All @@ -44,27 +44,27 @@ distlib==0.3.9 # via virtualenv
docutils==0.21.2 # via sphinx, sphinx-rtd-theme
exceptiongroup==1.2.2 # via hypothesis, ipython, pytest
execnet==2.1.1 # via pytest-cache, pytest-xdist
executing==2.1.0 # via devtools, stack-data
executing==2.2.0 # via devtools, stack-data
factory-boy==3.3.1 # via gt4py (pyproject.toml), pytest-factoryboy
faker==33.3.0 # via factory-boy
faker==35.0.0 # via factory-boy
fastjsonschema==2.21.1 # via nbformat
filelock==3.16.1 # via gt4py (pyproject.toml), tox, virtualenv
fonttools==4.55.3 # via matplotlib
filelock==3.17.0 # via gt4py (pyproject.toml), tox, virtualenv
fonttools==4.55.5 # via matplotlib
fparser==0.2.0 # via dace
frozendict==2.4.6 # via gt4py (pyproject.toml)
gitdb==4.0.12 # via gitpython
gitpython==3.1.44 # via tach
gridtools-cpp==2.3.8 # via gt4py (pyproject.toml)
hypothesis==6.123.11 # via -r requirements-dev.in, gt4py (pyproject.toml)
identify==2.6.5 # via pre-commit
hypothesis==6.124.2 # via -r requirements-dev.in, gt4py (pyproject.toml)
identify==2.6.6 # via pre-commit
idna==3.10 # via requests
imagesize==1.4.1 # via sphinx
inflection==0.5.1 # via pytest-factoryboy
iniconfig==2.0.0 # via pytest
ipykernel==6.29.5 # via nbmake
ipython==8.31.0 # via ipykernel
jax==0.4.38 # via gt4py (pyproject.toml)
jaxlib==0.4.38 # via jax
jax==0.5.0 # via gt4py (pyproject.toml)
jaxlib==0.5.0 # via jax
jedi==0.19.2 # via ipython
jinja2==3.1.5 # via gt4py (pyproject.toml), sphinx
jsonschema==4.23.0 # via nbformat
Expand Down Expand Up @@ -106,19 +106,19 @@ pipdeptree==2.24.0 # via -r requirements-dev.in
platformdirs==4.3.6 # via black, jupyter-core, tox, virtualenv
pluggy==1.5.0 # via pytest, tox
ply==3.11 # via dace
pre-commit==4.0.1 # via -r requirements-dev.in
prompt-toolkit==3.0.48 # via ipython, questionary, tach
pre-commit==4.1.0 # via -r requirements-dev.in
prompt-toolkit==3.0.50 # via ipython, questionary, tach
psutil==6.1.1 # via -r requirements-dev.in, ipykernel, pytest-xdist
ptyprocess==0.7.0 # via pexpect
pure-eval==0.2.3 # via stack-data
pybind11==2.13.6 # via gt4py (pyproject.toml)
pydantic==2.10.4 # via bump-my-version, pydantic-settings
pydantic==2.10.5 # via bump-my-version, pydantic-settings
pydantic-core==2.27.2 # via pydantic
pydantic-settings==2.7.1 # via bump-my-version
pydot==3.0.4 # via tach
pygments==2.19.1 # via -r requirements-dev.in, devtools, ipython, nbmake, rich, sphinx
pyparsing==3.2.1 # via matplotlib, pydot
pyproject-api==1.8.0 # via tox
pyproject-api==1.9.0 # via tox
pyproject-hooks==1.2.0 # via build, pip-tools
pytest==8.3.4 # via -r requirements-dev.in, gt4py (pyproject.toml), nbmake, pytest-cache, pytest-cov, pytest-custom-exit-code, pytest-factoryboy, pytest-instafail, pytest-xdist
pytest-cache==1.0 # via -r requirements-dev.in
Expand All @@ -132,13 +132,13 @@ python-dotenv==1.0.1 # via pydantic-settings
pyyaml==6.0.2 # via dace, jupytext, pre-commit, tach
pyzmq==26.2.0 # via ipykernel, jupyter-client
questionary==2.1.0 # via bump-my-version
referencing==0.35.1 # via jsonschema, jsonschema-specifications
referencing==0.36.1 # via jsonschema, jsonschema-specifications
requests==2.32.3 # via sphinx
rich==13.9.4 # via bump-my-version, rich-click, tach
rich-click==1.8.5 # via bump-my-version
rpds-py==0.22.3 # via jsonschema, referencing
ruff==0.8.6 # via -r requirements-dev.in
scipy==1.15.0 # via gt4py (pyproject.toml), jax, jaxlib
ruff==0.9.2 # via -r requirements-dev.in
scipy==1.15.1 # via gt4py (pyproject.toml), jax, jaxlib
setuptools-scm==8.1.0 # via fparser
six==1.17.0 # via asttokens, astunparse, python-dateutil
smmap==5.0.2 # via gitdb
Expand All @@ -156,18 +156,18 @@ sphinxcontrib-serializinghtml==2.0.0 # via sphinx
stack-data==0.6.3 # via ipython
sympy==1.13.3 # via dace
tabulate==0.9.0 # via gt4py (pyproject.toml)
tach==0.19.5 # via -r requirements-dev.in
tach==0.22.0 # via -r requirements-dev.in
tomli==2.2.1 ; python_version < "3.11" # via -r requirements-dev.in, black, build, coverage, jupytext, mypy, pip-tools, pyproject-api, pytest, setuptools-scm, sphinx, tach, tox
tomli-w==1.1.0 # via tach
tomli-w==1.2.0 # via tach
tomlkit==0.13.2 # via bump-my-version
toolz==1.0.0 # via cytoolz
tornado==6.4.2 # via ipykernel, jupyter-client
tox==4.23.2 # via -r requirements-dev.in
tox==4.24.1 # via -r requirements-dev.in
traitlets==5.14.3 # via comm, ipykernel, ipython, jupyter-client, jupyter-core, matplotlib-inline, nbclient, nbformat
types-tabulate==0.9.0.20241207 # via -r requirements-dev.in
typing-extensions==4.12.2 # via black, faker, gt4py (pyproject.toml), ipython, mypy, pydantic, pydantic-core, pytest-factoryboy, rich, rich-click, tox
typing-extensions==4.12.2 # via black, faker, gt4py (pyproject.toml), ipython, mypy, pydantic, pydantic-core, pytest-factoryboy, referencing, rich, rich-click, tox
urllib3==2.3.0 # via requests
virtualenv==20.28.1 # via pre-commit, tox
virtualenv==20.29.1 # via pre-commit, tox
wcmatch==10.0 # via bump-my-version
wcwidth==0.2.13 # via prompt-toolkit
wheel==0.45.1 # via astunparse, pip-tools
Expand Down
2 changes: 1 addition & 1 deletion min-extra-requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ cmake==3.22
cogapp==3.3
coverage[toml]==5.0
cytoolz==0.12.1
dace==1.0.0
dace==1.0.1
darglint==1.6
deepdiff==5.6.0
devtools==0.6
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ all-cuda12 = ['gt4py[cuda12,dace,formatting,jax-cuda12,performance,testing]']
# Other extras
cuda11 = ['cupy-cuda11x>=12.0']
cuda12 = ['cupy-cuda12x>=12.0']
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
formatting = ['clang-format>=9.0']
gpu = ['cupy>=12.0']
jax-cpu = ['jax[cpu]>=0.4.18']
Expand Down
50 changes: 25 additions & 25 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ bracex==2.5.post1 # via -c constraints.txt, wcmatch
build==1.2.2.post1 # via -c constraints.txt, pip-tools
bump-my-version==0.29.0 # via -c constraints.txt, -r requirements-dev.in
cached-property==2.0.1 # via -c constraints.txt, gt4py (pyproject.toml)
cachetools==5.5.0 # via -c constraints.txt, tox
cachetools==5.5.1 # via -c constraints.txt, tox
certifi==2024.12.14 # via -c constraints.txt, requests
cfgv==3.4.0 # via -c constraints.txt, pre-commit
chardet==5.2.0 # via -c constraints.txt, tox
charset-normalizer==3.4.1 # via -c constraints.txt, requests
clang-format==19.1.6 # via -c constraints.txt, -r requirements-dev.in, gt4py (pyproject.toml)
clang-format==19.1.7 # via -c constraints.txt, -r requirements-dev.in, gt4py (pyproject.toml)
click==8.1.8 # via -c constraints.txt, black, bump-my-version, gt4py (pyproject.toml), pip-tools, rich-click
cmake==3.31.2 # via -c constraints.txt, gt4py (pyproject.toml)
cmake==3.31.4 # via -c constraints.txt, gt4py (pyproject.toml)
cogapp==3.4.1 # via -c constraints.txt, -r requirements-dev.in
colorama==0.4.6 # via -c constraints.txt, tox
comm==0.2.2 # via -c constraints.txt, ipykernel
contourpy==1.3.1 # via -c constraints.txt, matplotlib
coverage[toml]==7.6.10 # via -c constraints.txt, -r requirements-dev.in, pytest-cov
cycler==0.12.1 # via -c constraints.txt, matplotlib
cytoolz==1.0.1 # via -c constraints.txt, gt4py (pyproject.toml)
dace==1.0.0 # via -c constraints.txt, gt4py (pyproject.toml)
dace==1.0.1 # via -c constraints.txt, gt4py (pyproject.toml)
darglint==1.8.1 # via -c constraints.txt, -r requirements-dev.in
debugpy==1.8.11 # via -c constraints.txt, ipykernel
debugpy==1.8.12 # via -c constraints.txt, ipykernel
decorator==5.1.1 # via -c constraints.txt, ipython
deepdiff==8.1.1 # via -c constraints.txt, gt4py (pyproject.toml)
devtools==0.12.2 # via -c constraints.txt, gt4py (pyproject.toml)
Expand All @@ -44,27 +44,27 @@ distlib==0.3.9 # via -c constraints.txt, virtualenv
docutils==0.21.2 # via -c constraints.txt, sphinx, sphinx-rtd-theme
exceptiongroup==1.2.2 # via -c constraints.txt, hypothesis, ipython, pytest
execnet==2.1.1 # via -c constraints.txt, pytest-cache, pytest-xdist
executing==2.1.0 # via -c constraints.txt, devtools, stack-data
executing==2.2.0 # via -c constraints.txt, devtools, stack-data
factory-boy==3.3.1 # via -c constraints.txt, gt4py (pyproject.toml), pytest-factoryboy
faker==33.3.0 # via -c constraints.txt, factory-boy
faker==35.0.0 # via -c constraints.txt, factory-boy
fastjsonschema==2.21.1 # via -c constraints.txt, nbformat
filelock==3.16.1 # via -c constraints.txt, gt4py (pyproject.toml), tox, virtualenv
fonttools==4.55.3 # via -c constraints.txt, matplotlib
filelock==3.17.0 # via -c constraints.txt, gt4py (pyproject.toml), tox, virtualenv
fonttools==4.55.5 # via -c constraints.txt, matplotlib
fparser==0.2.0 # via -c constraints.txt, dace
frozendict==2.4.6 # via -c constraints.txt, gt4py (pyproject.toml)
gitdb==4.0.12 # via -c constraints.txt, gitpython
gitpython==3.1.44 # via -c constraints.txt, tach
gridtools-cpp==2.3.8 # via -c constraints.txt, gt4py (pyproject.toml)
hypothesis==6.123.11 # via -c constraints.txt, -r requirements-dev.in, gt4py (pyproject.toml)
identify==2.6.5 # via -c constraints.txt, pre-commit
hypothesis==6.124.2 # via -c constraints.txt, -r requirements-dev.in, gt4py (pyproject.toml)
identify==2.6.6 # via -c constraints.txt, pre-commit
idna==3.10 # via -c constraints.txt, requests
imagesize==1.4.1 # via -c constraints.txt, sphinx
inflection==0.5.1 # via -c constraints.txt, pytest-factoryboy
iniconfig==2.0.0 # via -c constraints.txt, pytest
ipykernel==6.29.5 # via -c constraints.txt, nbmake
ipython==8.31.0 # via -c constraints.txt, ipykernel
jax[cpu]==0.4.38 # via -c constraints.txt, gt4py (pyproject.toml)
jaxlib==0.4.38 # via -c constraints.txt, jax
jax[cpu]==0.5.0 # via -c constraints.txt, gt4py (pyproject.toml)
jaxlib==0.5.0 # via -c constraints.txt, jax
jedi==0.19.2 # via -c constraints.txt, ipython
jinja2==3.1.5 # via -c constraints.txt, gt4py (pyproject.toml), sphinx
jsonschema==4.23.0 # via -c constraints.txt, nbformat
Expand Down Expand Up @@ -106,19 +106,19 @@ pipdeptree==2.24.0 # via -c constraints.txt, -r requirements-dev.in
platformdirs==4.3.6 # via -c constraints.txt, black, jupyter-core, tox, virtualenv
pluggy==1.5.0 # via -c constraints.txt, pytest, tox
ply==3.11 # via -c constraints.txt, dace
pre-commit==4.0.1 # via -c constraints.txt, -r requirements-dev.in
prompt-toolkit==3.0.48 # via -c constraints.txt, ipython, questionary, tach
pre-commit==4.1.0 # via -c constraints.txt, -r requirements-dev.in
prompt-toolkit==3.0.50 # via -c constraints.txt, ipython, questionary, tach
psutil==6.1.1 # via -c constraints.txt, -r requirements-dev.in, ipykernel, pytest-xdist
ptyprocess==0.7.0 # via -c constraints.txt, pexpect
pure-eval==0.2.3 # via -c constraints.txt, stack-data
pybind11==2.13.6 # via -c constraints.txt, gt4py (pyproject.toml)
pydantic==2.10.4 # via -c constraints.txt, bump-my-version, pydantic-settings
pydantic==2.10.5 # via -c constraints.txt, bump-my-version, pydantic-settings
pydantic-core==2.27.2 # via -c constraints.txt, pydantic
pydantic-settings==2.7.1 # via -c constraints.txt, bump-my-version
pydot==3.0.4 # via -c constraints.txt, tach
pygments==2.19.1 # via -c constraints.txt, -r requirements-dev.in, devtools, ipython, nbmake, rich, sphinx
pyparsing==3.2.1 # via -c constraints.txt, matplotlib, pydot
pyproject-api==1.8.0 # via -c constraints.txt, tox
pyproject-api==1.9.0 # via -c constraints.txt, tox
pyproject-hooks==1.2.0 # via -c constraints.txt, build, pip-tools
pytest==8.3.4 # via -c constraints.txt, -r requirements-dev.in, gt4py (pyproject.toml), nbmake, pytest-cache, pytest-cov, pytest-custom-exit-code, pytest-factoryboy, pytest-instafail, pytest-xdist
pytest-cache==1.0 # via -c constraints.txt, -r requirements-dev.in
Expand All @@ -132,13 +132,13 @@ python-dotenv==1.0.1 # via -c constraints.txt, pydantic-settings
pyyaml==6.0.2 # via -c constraints.txt, dace, jupytext, pre-commit, tach
pyzmq==26.2.0 # via -c constraints.txt, ipykernel, jupyter-client
questionary==2.1.0 # via -c constraints.txt, bump-my-version
referencing==0.35.1 # via -c constraints.txt, jsonschema, jsonschema-specifications
referencing==0.36.1 # via -c constraints.txt, jsonschema, jsonschema-specifications
requests==2.32.3 # via -c constraints.txt, sphinx
rich==13.9.4 # via -c constraints.txt, bump-my-version, rich-click, tach
rich-click==1.8.5 # via -c constraints.txt, bump-my-version
rpds-py==0.22.3 # via -c constraints.txt, jsonschema, referencing
ruff==0.8.6 # via -c constraints.txt, -r requirements-dev.in
scipy==1.15.0 # via -c constraints.txt, jax, jaxlib
ruff==0.9.2 # via -c constraints.txt, -r requirements-dev.in
scipy==1.15.1 # via -c constraints.txt, jax, jaxlib
setuptools-scm==8.1.0 # via -c constraints.txt, fparser
six==1.17.0 # via -c constraints.txt, asttokens, astunparse, python-dateutil
smmap==5.0.2 # via -c constraints.txt, gitdb
Expand All @@ -156,18 +156,18 @@ sphinxcontrib-serializinghtml==2.0.0 # via -c constraints.txt, sphinx
stack-data==0.6.3 # via -c constraints.txt, ipython
sympy==1.13.3 # via -c constraints.txt, dace
tabulate==0.9.0 # via -c constraints.txt, gt4py (pyproject.toml)
tach==0.19.5 # via -c constraints.txt, -r requirements-dev.in
tach==0.22.0 # via -c constraints.txt, -r requirements-dev.in
tomli==2.2.1 ; python_version < "3.11" # via -c constraints.txt, -r requirements-dev.in, black, build, coverage, jupytext, mypy, pip-tools, pyproject-api, pytest, setuptools-scm, sphinx, tach, tox
tomli-w==1.1.0 # via -c constraints.txt, tach
tomli-w==1.2.0 # via -c constraints.txt, tach
tomlkit==0.13.2 # via -c constraints.txt, bump-my-version
toolz==1.0.0 # via -c constraints.txt, cytoolz
tornado==6.4.2 # via -c constraints.txt, ipykernel, jupyter-client
tox==4.23.2 # via -c constraints.txt, -r requirements-dev.in
tox==4.24.1 # via -c constraints.txt, -r requirements-dev.in
traitlets==5.14.3 # via -c constraints.txt, comm, ipykernel, ipython, jupyter-client, jupyter-core, matplotlib-inline, nbclient, nbformat
types-tabulate==0.9.0.20241207 # via -c constraints.txt, -r requirements-dev.in
typing-extensions==4.12.2 # via -c constraints.txt, black, faker, gt4py (pyproject.toml), ipython, mypy, pydantic, pydantic-core, pytest-factoryboy, rich, rich-click, tox
typing-extensions==4.12.2 # via -c constraints.txt, black, faker, gt4py (pyproject.toml), ipython, mypy, pydantic, pydantic-core, pytest-factoryboy, referencing, rich, rich-click, tox
urllib3==2.3.0 # via -c constraints.txt, requests
virtualenv==20.28.1 # via -c constraints.txt, pre-commit, tox
virtualenv==20.29.1 # via -c constraints.txt, pre-commit, tox
wcmatch==10.0 # via -c constraints.txt, bump-my-version
wcwidth==0.2.13 # via -c constraints.txt, prompt-toolkit
wheel==0.45.1 # via -c constraints.txt, astunparse, pip-tools
Expand Down
2 changes: 1 addition & 1 deletion src/gt4py/cartesian/gtc/cuir/cuir_codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def maybe_const(s):
decl = symtable[node.name]
if isinstance(decl, cuir.Temporary) and decl.data_dims:
data_index_str = "+".join(
f"{index}*{int(np.prod(decl.data_dims[i + 1:], initial=1))}"
f"{index}*{int(np.prod(decl.data_dims[i + 1 :], initial=1))}"
for i, index in enumerate(data_index)
)
return f"{name}({offset})[{data_index_str}]"
Expand Down
6 changes: 3 additions & 3 deletions src/gt4py/cartesian/gtc/dace/expansion_specification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@ def _populate_gpu_schedules(expansion_specification: List[ExpansionItem]):
tiled = True
break
if not tiled:
assert any(
isinstance(item, Map) for item in expansion_specification
), "needs at least one map to avoid dereferencing on CPU"
assert any(isinstance(item, Map) for item in expansion_specification), (
"needs at least one map to avoid dereferencing on CPU"
)
for es in expansion_specification:
if isinstance(es, Map):
if es.schedule is None:
Expand Down
2 changes: 1 addition & 1 deletion src/gt4py/cartesian/gtc/dace/symbol_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def get_axis_bound_diff_str(axis_bound1, axis_bound2, var_name: str):
var = var_name
else:
var = ""
return f"{sign}({var}{axis_bound1.offset-axis_bound2.offset:+d})"
return f"{sign}({var}{axis_bound1.offset - axis_bound2.offset:+d})"


@lru_cache(maxsize=None)
Expand Down
Loading
Loading