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[cartesian][next]: Bump dace version from 0.14.4 to 0.15.1 #1391

Merged
merged 27 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f851837
[dace] Enable tests after dace fix
edopao Nov 24, 2023
1fd70a2
[dace] Apply dace optimizations
edopao Nov 24, 2023
8bf906d
[dace] Use dace helper to set gpu storage
edopao Nov 24, 2023
f6b5cd4
Merge branch 'GridTools:main' into dace-next
edopao Nov 30, 2023
4f34ec2
[dace] Apply gpu storage after optimization
edopao Nov 30, 2023
5a057e6
[dace] Minor edit
edopao Nov 30, 2023
3f4d042
Merge remote-tracking branch 'origin/main' into dace-next
edopao Dec 5, 2023
b8c0001
Bump dace version from 0.14.4 to 0.15.1
edopao Dec 11, 2023
a3aa759
Keep test_floordiv disabled on GPU
edopao Dec 11, 2023
83d3e13
Merge remote-tracking branch 'origin/main' into dace-next
edopao Dec 12, 2023
d8da3c0
[dace] Enable test_conditional_w_tuple
edopao Dec 12, 2023
cc161bf
Merge remote-tracking branch 'origin/main' into dace-next
edopao Dec 13, 2023
eda6c0f
[dace] Disable auto-optimize
edopao Dec 13, 2023
608fcaa
[all] Fix and/or suppress flake8 errors
edopao Dec 13, 2023
a30c908
Merge branch 'GridTools:main' into dace-next
edopao Dec 13, 2023
207fc27
[all] Bump mypy version in pre-commit-config to match constraint
edopao Dec 14, 2023
57c5daf
Revert "[dace] Disable auto-optimize"
edopao Dec 18, 2023
81930a3
[dace] Fix memlet for array slicing
edopao Dec 18, 2023
507a51d
Merge remote-tracking branch 'origin/dace-fix-deref' into dace-next
edopao Dec 18, 2023
6a38899
Revert "Merge remote-tracking branch 'origin/dace-fix-deref' into dac…
edopao Dec 19, 2023
77c35aa
Merge remote-tracking branch 'origin/main' into dace-next
edopao Dec 19, 2023
694bed0
Merge remote-tracking branch 'origin/main' into dace-next
edopao Jan 4, 2024
9420913
Merge branch 'GridTools:main' into dace-next
edopao Jan 17, 2024
5adc444
Review comments
edopao Jan 18, 2024
cc9fe08
Suppress arg-type mypy error
edopao Jan 19, 2024
ac8c5d6
Merge remote-tracking branch 'origin/main' into dace-next
edopao Jan 19, 2024
1c56fb0
Fix baseline issue
edopao Jan 19, 2024
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
38 changes: 19 additions & 19 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ repos:
## version = re.search('black==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"rev: '{version}' # version from constraints.txt")
##]]]
rev: '23.9.1' # version from constraints.txt
rev: '23.11.0' # version from constraints.txt
##[[[end]]]
hooks:
- id: black
Expand All @@ -73,7 +73,7 @@ repos:
## version = re.search('isort==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"rev: '{version}' # version from constraints.txt")
##]]]
rev: '5.12.0' # version from constraints.txt
rev: '5.13.0' # version from constraints.txt
##[[[end]]]
hooks:
- id: isort
Expand All @@ -97,14 +97,14 @@ repos:
## print(f"- {pkg}==" + str(re.search(f'\n{pkg}==([0-9\.]*)', constraints)[1]))
##]]]
- darglint==1.8.1
- flake8-bugbear==23.9.16
- flake8-builtins==2.1.0
- flake8-bugbear==23.12.2
- flake8-builtins==2.2.0
- flake8-debugger==4.1.2
- flake8-docstrings==1.7.0
- flake8-eradicate==1.5.0
- flake8-mutable==1.2.0
- flake8-pyproject==1.2.3
- pygments==2.16.1
- pygments==2.17.2
##[[[end]]]
# - flake8-rst-docstrings # Disabled for now due to random false positives
exclude: |
Expand Down Expand Up @@ -146,9 +146,9 @@ repos:
## version = re.search('mypy==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"#========= FROM constraints.txt: v{version} =========")
##]]]
#========= FROM constraints.txt: v1.5.1 =========
#========= FROM constraints.txt: v1.7.1 =========
##[[[end]]]
rev: v1.5.1 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
rev: v1.7.1 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
hooks:
- id: mypy
additional_dependencies: # versions from constraints.txt
Expand All @@ -162,26 +162,26 @@ repos:
##]]]
- astunparse==1.6.3
- attrs==23.1.0
- black==23.9.1
- boltons==23.0.0
- black==23.11.0
- boltons==23.1.1
- cached-property==1.5.2
- click==8.1.7
- cmake==3.27.5
- cmake==3.27.9
- cytoolz==0.12.2
- deepdiff==6.5.0
- deepdiff==6.7.1
- devtools==0.12.2
- frozendict==2.3.8
- frozendict==2.3.10
- gridtools-cpp==2.3.1
- importlib-resources==6.0.1
- importlib-resources==6.1.1
- jinja2==3.1.2
- lark==1.1.7
- mako==1.2.4
- nanobind==1.5.2
- ninja==1.11.1
- lark==1.1.8
- mako==1.3.0
- nanobind==1.8.0
- ninja==1.11.1.1
- numpy==1.24.4
- packaging==23.1
- packaging==23.2
- pybind11==2.11.1
- setuptools==68.2.2
- setuptools==69.0.2
- tabulate==0.9.0
- typing-extensions==4.5.0
- xxhash==3.0.0
Expand Down
191 changes: 102 additions & 89 deletions constraints.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions min-extra-requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cmake==3.22
cogapp==3.3
coverage[toml]==5.0
cytoolz==0.12.0
dace==0.14.2
dace==0.15.1
darglint==1.6
deepdiff==5.6.0
devtools==0.6
Expand Down Expand Up @@ -70,7 +70,7 @@ scipy==1.7.2
setuptools==65.5.0
sphinx==4.4
sphinx_rtd_theme==1.0
sympy==1.7
sympy==1.9
tabulate==0.8.10
tomli==2.0.1
tox==3.2.0
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ requires-python = '>=3.8'
cuda = ['cupy>=12.0']
cuda11x = ['cupy-cuda11x>=12.0']
cuda12x = ['cupy-cuda12x>=12.0']
dace = ['dace>=0.14.2,<0.15', 'sympy>=1.7']
dace = ['dace>=0.15.1,<0.16', 'sympy>=1.9']
formatting = ['clang-format>=9.0']
# Always add all extra packages to 'full' for a simple full gt4py installation
full = [
'clang-format>=9.0',
'dace>=0.14.2,<0.15',
'dace>=0.15.1,<0.16',
'hypothesis>=6.0.0',
'pytest>=7.0',
'sympy>=1.7',
'sympy>=1.9',
'scipy>=1.7.2',
'jax[cpu]>=0.4.13'
]
Expand Down
Loading
Loading