Skip to content

Commit

Permalink
Merge branch 'main' into cartesian/k_write_offset
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Deconinck committed Sep 19, 2024
2 parents 284497a + 2eed367 commit 2846713
Show file tree
Hide file tree
Showing 124 changed files with 2,765 additions and 1,559 deletions.
14 changes: 10 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ repos:
exclude: tox.ini
- id: pretty-format-toml
args: [--autofix]
exclude: tach.toml
- id: pretty-format-yaml
args: [--autofix, --preserve-quotes, --indent, "2"]

Expand Down Expand Up @@ -50,7 +51,7 @@ repos:
## version = re.search('ruff==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"rev: v{version}")
##]]]
rev: v0.6.3
rev: v0.6.4
##[[[end]]]
hooks:
# Run the linter.
Expand All @@ -61,6 +62,11 @@ repos:
# Run the formatter.
- id: ruff-format

- repo: https://github.com/gauge-sh/tach-pre-commit
rev: v0.10.7
hooks:
- id: tach

- repo: https://github.com/pre-commit/mirrors-mypy
##[[[cog
## import re
Expand Down Expand Up @@ -91,14 +97,14 @@ repos:
- boltons==24.0.0
- cached-property==1.5.2
- click==8.1.7
- cmake==3.30.2
- cmake==3.30.3
- cytoolz==0.12.3
- deepdiff==8.0.1
- devtools==0.12.2
- factory-boy==3.3.1
- frozendict==2.4.4
- gridtools-cpp==2.3.4
- importlib-resources==6.4.4
- importlib-resources==6.4.5
- jinja2==3.1.4
- lark==1.2.2
- mako==1.3.5
Expand All @@ -107,7 +113,7 @@ repos:
- numpy==1.24.4
- packaging==24.1
- pybind11==2.13.5
- setuptools==74.1.0
- setuptools==74.1.2
- tabulate==0.9.0
- typing-extensions==4.12.2
- xxhash==3.0.0
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- Ehrengruber, Till. ETH Zurich - CSCS
- Elbert, Oliver D. NOAA-GFDL
- Faghih-Naini, Sara. ECMWF
- Farabullini, Nicoletta. ETH Zurich - C2SM
- Farabullini, Nicoletta. ETH Zurich - EXCLAIM
- George, Rhea. Allen Institute for AI
- González Paredes, Enrique. ETH Zurich - CSCS
- Gopal, Abishek. ETH Zurich - EXCLAIM
Expand Down
61 changes: 34 additions & 27 deletions constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ backcall==0.2.0 # via ipython
black==24.8.0 # via gt4py (pyproject.toml)
boltons==24.0.0 # via gt4py (pyproject.toml)
bracex==2.5 # via wcmatch
build==1.2.1 # via pip-tools
build==1.2.2 # via pip-tools
bump-my-version==0.26.0 # via -r requirements-dev.in
cached-property==1.5.2 # via gt4py (pyproject.toml)
cachetools==5.5.0 # via tox
Expand All @@ -25,7 +25,7 @@ chardet==5.2.0 # via tox
charset-normalizer==3.3.2 # via requests
clang-format==18.1.8 # via -r requirements-dev.in, gt4py (pyproject.toml)
click==8.1.7 # via black, bump-my-version, gt4py (pyproject.toml), pip-tools, rich-click
cmake==3.30.2 # via gt4py (pyproject.toml)
cmake==3.30.3 # 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
Expand All @@ -42,43 +42,45 @@ devtools==0.12.2 # via gt4py (pyproject.toml)
dill==0.3.8 # via dace
distlib==0.3.8 # via virtualenv
docutils==0.20.1 # via sphinx, sphinx-rtd-theme
eval-type-backport==0.2.0 # via tach
exceptiongroup==1.2.2 # via hypothesis, pytest
execnet==2.1.1 # via pytest-cache, pytest-xdist
executing==2.1.0 # via devtools, stack-data
factory-boy==3.3.1 # via gt4py (pyproject.toml), pytest-factoryboy
faker==28.1.0 # via factory-boy
faker==28.4.1 # via factory-boy
fastjsonschema==2.20.0 # via nbformat
filelock==3.15.4 # via tox, virtualenv
filelock==3.16.0 # via tox, virtualenv
fonttools==4.53.1 # via matplotlib
fparser==0.1.4 # via dace
frozendict==2.4.4 # via gt4py (pyproject.toml)
gitdb==4.0.11 # via gitpython
gitpython==3.1.43 # via tach
gridtools-cpp==2.3.4 # via gt4py (pyproject.toml)
hypothesis==6.111.2 # via -r requirements-dev.in, gt4py (pyproject.toml)
hypothesis==6.112.0 # via -r requirements-dev.in, gt4py (pyproject.toml)
identify==2.6.0 # via pre-commit
idna==3.8 # via requests
imagesize==1.4.1 # via sphinx
importlib-metadata==8.4.0 # via build, jupyter-client, sphinx
importlib-resources==6.4.4 ; python_version < "3.9" # via gt4py (pyproject.toml), jsonschema, jsonschema-specifications, matplotlib
importlib-metadata==8.5.0 # via build, jupyter-client, sphinx
importlib-resources==6.4.5 ; python_version < "3.9" # via gt4py (pyproject.toml), jsonschema, jsonschema-specifications, matplotlib
inflection==0.5.1 # via pytest-factoryboy
iniconfig==2.0.0 # via pytest
ipykernel==6.29.5 # via nbmake
ipython==8.12.3 # via ipykernel
isort==5.13.2 # via -r requirements-dev.in
jedi==0.19.1 # via ipython
jinja2==3.1.4 # via dace, gt4py (pyproject.toml), sphinx
jsonschema==4.23.0 # via nbformat
jsonschema-specifications==2023.12.1 # via jsonschema
jupyter-client==8.6.2 # via ipykernel, nbclient
jupyter-core==5.7.2 # via ipykernel, jupyter-client, nbformat
jupytext==1.16.4 # via -r requirements-dev.in
kiwisolver==1.4.5 # via matplotlib
kiwisolver==1.4.7 # via matplotlib
lark==1.2.2 # via gt4py (pyproject.toml)
mako==1.3.5 # via gt4py (pyproject.toml)
markdown-it-py==3.0.0 # via jupytext, mdit-py-plugins, rich
markupsafe==2.1.5 # via jinja2, mako
matplotlib==3.7.5 # via -r requirements-dev.in
matplotlib-inline==0.1.7 # via ipykernel, ipython
mdit-py-plugins==0.4.1 # via jupytext
mdit-py-plugins==0.4.2 # via jupytext
mdurl==0.1.2 # via markdown-it-py
mpmath==1.3.0 # via sympy
mypy==1.11.2 # via -r requirements-dev.in
Expand All @@ -88,7 +90,7 @@ nbclient==0.6.8 # via nbmake
nbformat==5.10.4 # via jupytext, nbclient, nbmake
nbmake==1.5.4 # via -r requirements-dev.in
nest-asyncio==1.6.0 # via ipykernel, nbclient
networkx==3.1 # via dace
networkx==3.1 # via dace, tach
ninja==1.11.1.1 # via gt4py (pyproject.toml)
nodeenv==1.9.1 # via pre-commit
numpy==1.24.4 # via contourpy, dace, gt4py (pyproject.toml), matplotlib, scipy
Expand All @@ -100,25 +102,26 @@ pexpect==4.9.0 # via ipython
pickleshare==0.7.5 # via ipython
pillow==10.4.0 # via matplotlib
pip-tools==7.4.1 # via -r requirements-dev.in
pipdeptree==2.23.1 # via -r requirements-dev.in
pipdeptree==2.23.3 # via -r requirements-dev.in
pkgutil-resolve-name==1.3.10 # via jsonschema
platformdirs==4.2.2 # via black, jupyter-core, tox, virtualenv
platformdirs==4.3.2 # via black, jupyter-core, tox, virtualenv
pluggy==1.5.0 # via pytest, tox
ply==3.11 # via dace
pre-commit==3.5.0 # via -r requirements-dev.in
prompt-toolkit==3.0.36 # via ipython, questionary
prompt-toolkit==3.0.36 # via ipython, questionary, tach
psutil==6.0.0 # 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.5 # via gt4py (pyproject.toml)
pydantic==2.8.2 # via bump-my-version, pydantic-settings
pydantic-core==2.20.1 # via pydantic
pydantic-settings==2.4.0 # via bump-my-version
pydantic==2.9.1 # via bump-my-version, pydantic-settings, tach
pydantic-core==2.23.3 # via pydantic
pydantic-settings==2.5.2 # via bump-my-version
pydot==2.0.0 # via tach
pygments==2.18.0 # via -r requirements-dev.in, devtools, ipython, nbmake, rich, sphinx
pyparsing==3.1.4 # via matplotlib
pyparsing==3.1.4 # via matplotlib, pydot
pyproject-api==1.7.1 # via tox
pyproject-hooks==1.1.0 # via build, pip-tools
pytest==8.3.2 # via -r requirements-dev.in, gt4py (pyproject.toml), nbmake, pytest-cache, pytest-cov, pytest-custom-exit-code, pytest-factoryboy, pytest-instafail, pytest-xdist
pytest==8.3.3 # 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
pytest-cov==5.0.0 # via -r requirements-dev.in
pytest-custom-exit-code==0.3.0 # via -r requirements-dev.in
Expand All @@ -127,19 +130,20 @@ pytest-instafail==0.5.0 # via -r requirements-dev.in
pytest-xdist==3.6.1 # via -r requirements-dev.in
python-dateutil==2.9.0.post0 # via faker, jupyter-client, matplotlib
python-dotenv==1.0.1 # via pydantic-settings
pytz==2024.1 # via babel
pyyaml==6.0.2 # via dace, jupytext, pre-commit
pytz==2024.2 # via babel
pyyaml==6.0.2 # via dace, jupytext, pre-commit, tach
pyzmq==26.2.0 # via ipykernel, jupyter-client
questionary==2.0.1 # via bump-my-version
referencing==0.35.1 # via jsonschema, jsonschema-specifications
requests==2.32.3 # via sphinx
rich==13.8.0 # via bump-my-version, rich-click
rich==13.8.1 # via bump-my-version, rich-click, tach
rich-click==1.8.3 # via bump-my-version
rpds-py==0.20.0 # via jsonschema, referencing
ruff==0.6.3 # via -r requirements-dev.in
ruff==0.6.4 # via -r requirements-dev.in
scipy==1.10.1 # via gt4py (pyproject.toml)
setuptools-scm==8.1.0 # via fparser
six==1.16.0 # via asttokens, astunparse, python-dateutil
smmap==5.0.1 # via gitdb
snowballstemmer==2.2.0 # via sphinx
sortedcontainers==2.4.0 # via hypothesis
sphinx==7.1.2 # via -r requirements-dev.in, sphinx-rtd-theme, sphinxcontrib-jquery
Expand All @@ -152,18 +156,21 @@ sphinxcontrib-jsmath==1.0.1 # via sphinx
sphinxcontrib-qthelp==1.0.3 # via sphinx
sphinxcontrib-serializinghtml==1.1.5 # via sphinx
stack-data==0.6.3 # via ipython
stdlib-list==0.10.0 # via tach
sympy==1.12.1 # via dace, gt4py (pyproject.toml)
tabulate==0.9.0 # via gt4py (pyproject.toml)
tach==0.10.7 # via -r requirements-dev.in
tomli==2.0.1 ; python_version < "3.11" # via -r requirements-dev.in, black, build, coverage, jupytext, mypy, pip-tools, pyproject-api, pytest, setuptools-scm, tox
tomli-w==1.0.0 # via tach
tomlkit==0.13.2 # via bump-my-version
toolz==0.12.1 # via cytoolz
tornado==6.4.1 # via ipykernel, jupyter-client
tox==4.18.0 # via -r requirements-dev.in
tox==4.18.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.20240106 # via -r requirements-dev.in
typing-extensions==4.12.2 # via annotated-types, black, gt4py (pyproject.toml), ipython, mypy, pydantic, pydantic-core, pytest-factoryboy, rich, rich-click, setuptools-scm
urllib3==2.2.2 # via requests
virtualenv==20.26.3 # via pre-commit, tox
urllib3==2.2.3 # via requests
virtualenv==20.26.4 # via pre-commit, tox
wcmatch==9.0 # via bump-my-version
wcwidth==0.2.13 # via prompt-toolkit
websockets==13.0.1 # via dace
Expand All @@ -173,4 +180,4 @@ zipp==3.20.1 # via importlib-metadata, importlib-resources

# The following packages are considered to be unsafe in a requirements file:
pip==24.2 # via pip-tools, pipdeptree
setuptools==74.1.0 # via gt4py (pyproject.toml), pip-tools, setuptools-scm
setuptools==74.1.2 # via gt4py (pyproject.toml), pip-tools, setuptools-scm
2 changes: 1 addition & 1 deletion min-extra-requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ frozendict==2.3
gridtools-cpp==2.3.4
hypothesis==6.0.0
importlib-resources==5.0; python_version < "3.9"
isort==5.10
jax[cpu]==0.4.18; python_version >= "3.10"
jinja2==3.0.0
jupytext==1.14
Expand Down Expand Up @@ -103,6 +102,7 @@ sphinx==4.4
sphinx_rtd_theme==1.0
sympy==1.9
tabulate==0.8.10
tach==0.10.7
tomli==2.0.1; python_version < "3.11"
tox==3.2.0
types-tabulate==0.8.10
Expand Down
2 changes: 1 addition & 1 deletion min-requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ frozendict==2.3
gridtools-cpp==2.3.4
hypothesis==6.0.0
importlib-resources==5.0; python_version < "3.9"
isort==5.10
jinja2==3.0.0
jupytext==1.14
lark==1.1.2
Expand Down Expand Up @@ -96,6 +95,7 @@ setuptools==65.5.0
sphinx==4.4
sphinx_rtd_theme==1.0
tabulate==0.8.10
tach==0.10.7
tomli==2.0.1; python_version < "3.11"
tox==3.2.0
types-tabulate==0.8.10
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ module = 'gt4py.next.iterator.runtime'

[tool.pytest.ini_options]
markers = [
'all: special marker that skips all tests',
'requires_atlas: tests that require `atlas4py` bindings package',
'requires_dace: tests that require `dace` package',
'requires_gpu: tests that require a NVidia GPU (`cupy` and `cudatoolkit` are required)',
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ cogapp>=3.3
coverage[toml]>=5.0
darglint>=1.6
hypothesis # constraints in gt4py['testing']
isort>=5.10
jupytext>=1.14
mypy>=1.0
matplotlib>=3.3
Expand All @@ -31,6 +30,7 @@ pytest-instafail>=0.5.0
ruff>=0.2.0
sphinx>=4.4
sphinx_rtd_theme>=1.0
tach>=0.10.7
tomli>=2.0.1;python_version<'3.11'
tox>=3.2.0
types-tabulate>=0.8.10
Loading

0 comments on commit 2846713

Please sign in to comment.