Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dace-fieldview
Browse files Browse the repository at this point in the history
  • Loading branch information
edopao committed Jun 28, 2024
2 parents a5b0f41 + 3ca278d commit f7ac3d8
Show file tree
Hide file tree
Showing 80 changed files with 2,863 additions and 3,382 deletions.
1 change: 1 addition & 0 deletions .github/workflows/daily-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Daily CI
on:
schedule:
- cron: '0 4 * * *'
workflow_dispatch:

## COMMENTED OUT: only for testing CI action changes
# pull_request:
Expand Down
20 changes: 10 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ repos:
## version = re.search('ruff==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"rev: v{version}")
##]]]
rev: v0.4.4
rev: v0.4.10
##[[[end]]]
hooks:
# Run the linter.
Expand All @@ -66,9 +66,9 @@ repos:
## version = re.search('mypy==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"#========= FROM constraints.txt: v{version} =========")
##]]]
#========= FROM constraints.txt: v1.10.0 =========
#========= FROM constraints.txt: v1.10.1 =========
##[[[end]]]
rev: v1.10.0 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
rev: v1.10.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 @@ -90,25 +90,25 @@ repos:
- boltons==24.0.0
- cached-property==1.5.2
- click==8.1.7
- cmake==3.29.3
- cmake==3.29.6
- cytoolz==0.12.3
- deepdiff==7.0.1
- devtools==0.12.2
- factory-boy==3.3.0
- frozendict==2.4.4
- gridtools-cpp==2.3.2
- gridtools-cpp==2.3.4
- importlib-resources==6.4.0
- jinja2==3.1.4
- lark==1.1.9
- mako==1.3.5
- nanobind==1.9.2
- nanobind==2.0.0
- ninja==1.11.1.1
- numpy==1.24.4
- packaging==24.0
- pybind11==2.12.0
- setuptools==69.5.1
- packaging==24.1
- pybind11==2.13.1
- setuptools==70.1.1
- tabulate==0.9.0
- typing-extensions==4.11.0
- typing-extensions==4.12.2
- xxhash==3.0.0
##[[[end]]]
# Add all type stubs from typeshed
Expand Down
10 changes: 5 additions & 5 deletions ci/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ RUN apt-get update -qq && apt-get install -qq -y --no-install-recommends \
htop && \
rm -rf /var/lib/apt/lists/*

RUN wget --quiet https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz && \
echo c66e88d5786f2ca4dbebb14e06b566fb642a1a6947ad8cc9091f9f445134143f boost_1_72_0.tar.gz > boost_hash.txt && \
RUN wget --quiet https://archives.boost.io/release/1.85.0/source/boost_1_85_0.tar.gz && \
echo be0d91732d5b0cc6fbb275c7939974457e79b54d6f07ce2e3dfdd68bef883b0b boost_1_85_0.tar.gz > boost_hash.txt && \
sha256sum -c boost_hash.txt && \
tar xzf boost_1_72_0.tar.gz && \
mv boost_1_72_0/boost /usr/local/include/ && \
rm boost_1_72_0.tar.gz boost_hash.txt
tar xzf boost_1_85_0.tar.gz && \
mv boost_1_85_0/boost /usr/local/include/ && \
rm boost_1_85_0.tar.gz boost_hash.txt

ENV BOOST_ROOT /usr/local/
ENV CUDA_HOME /usr/local/cuda
Expand Down
6 changes: 3 additions & 3 deletions ci/cscs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ build py38 baseimage:
# the following jobs via a dotenv file.
before_script:
- DOCKER_TAG=`sha256sum ci/base.Dockerfile | head -c 16`
- export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/gt4py-ci:$DOCKER_TAG-$PYVERSION
- export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/public/base/gt4py-ci:$DOCKER_TAG-$PYVERSION
- echo "BASE_IMAGE_${PYVERSION_PREFIX}=$PERSIST_IMAGE_NAME" >> build.env
artifacts:
reports:
Expand Down Expand Up @@ -58,7 +58,7 @@ build py38 image:
variables:
# make sure we use a unique name here, otherwise we could create a race condition, when multiple pipelines
# are running.
PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/gt4py/gt4py-ci:$CI_COMMIT_SHA-$PYVERSION
PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/public/gt4py/gt4py-ci:$CI_COMMIT_SHA-$PYVERSION
DOCKERFILE: ci/checkout.Dockerfile
DOCKER_BUILD_ARGS: '["PYVERSION=$PYVERSION", "BASE_IMAGE=${BASE_IMAGE_${PYVERSION_PREFIX}}"]'
<<: *py38
Expand All @@ -79,7 +79,7 @@ test py38:
extends: .container-runner-daint-gpu
needs: ["build py38 image"]
stage: test
image: $CSCS_REGISTRY_PATH/gt4py/gt4py-ci:$CI_COMMIT_SHA-$PYVERSION
image: $CSCS_REGISTRY_PATH/public/gt4py/gt4py-ci:$CI_COMMIT_SHA-$PYVERSION
script:
- cd /gt4py.src
- python -c "import cupy"
Expand Down
118 changes: 57 additions & 61 deletions constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,38 @@
#
aenum==3.1.15 # via dace
alabaster==0.7.13 # via sphinx
annotated-types==0.6.0 # via pydantic
annotated-types==0.7.0 # via pydantic
asttokens==2.4.1 # via devtools, stack-data
astunparse==1.6.3 ; python_version < "3.9" # via dace, gt4py (pyproject.toml)
attrs==23.2.0 # via flake8-bugbear, flake8-eradicate, gt4py (pyproject.toml), hypothesis, jsonschema, referencing
babel==2.15.0 # via sphinx
backcall==0.2.0 # via ipython
black==24.4.2 # via gt4py (pyproject.toml)
blinker==1.8.2 # via flask
boltons==24.0.0 # via gt4py (pyproject.toml)
bracex==2.4 # via wcmatch
build==1.2.1 # via pip-tools
bump-my-version==0.21.0 # via -r requirements-dev.in
bump-my-version==0.24.1 # via -r requirements-dev.in
cached-property==1.5.2 # via gt4py (pyproject.toml)
cachetools==5.3.3 # via tox
certifi==2024.2.2 # via requests
certifi==2024.6.2 # via requests
cffi==1.16.0 # via cryptography
cfgv==3.4.0 # via pre-commit
chardet==5.2.0 # via tox
charset-normalizer==3.3.2 # via requests
clang-format==18.1.5 # via -r requirements-dev.in, gt4py (pyproject.toml)
click==8.1.7 # via black, bump-my-version, flask, gt4py (pyproject.toml), pip-tools, rich-click
cmake==3.29.3 # via gt4py (pyproject.toml)
clang-format==18.1.7 # 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.29.6 # 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.1.1 # via matplotlib
coverage==7.5.1 # via -r requirements-dev.in, pytest-cov
cryptography==42.0.7 # via types-paramiko, types-pyopenssl, types-redis
coverage==7.5.4 # via -r requirements-dev.in, pytest-cov
cryptography==42.0.8 # via types-paramiko, types-pyopenssl, types-redis
cycler==0.12.1 # via matplotlib
cytoolz==0.12.3 # via gt4py (pyproject.toml)
dace==0.15.1 # via gt4py (pyproject.toml)
dace==0.16.1 # via gt4py (pyproject.toml)
darglint==1.8.1 # via -r requirements-dev.in
debugpy==1.8.1 # via ipykernel
debugpy==1.8.2 # via ipykernel
decorator==5.1.1 # via ipython
deepdiff==7.0.1 # via gt4py (pyproject.toml)
devtools==0.12.2 # via gt4py (pyproject.toml)
Expand All @@ -50,10 +49,10 @@ exceptiongroup==1.2.1 # via hypothesis, pytest
execnet==2.1.1 # via pytest-cache, pytest-xdist
executing==2.0.1 # via devtools, stack-data
factory-boy==3.3.0 # via gt4py (pyproject.toml), pytest-factoryboy
faker==25.2.0 # via factory-boy
fastjsonschema==2.19.1 # via nbformat
filelock==3.14.0 # via tox, virtualenv
flake8==7.0.0 # via -r requirements-dev.in, flake8-bugbear, flake8-builtins, flake8-debugger, flake8-docstrings, flake8-eradicate, flake8-mutable, flake8-pyproject, flake8-rst-docstrings
faker==26.0.0 # via factory-boy
fastjsonschema==2.20.0 # via nbformat
filelock==3.15.4 # via tox, virtualenv
flake8==7.1.0 # via -r requirements-dev.in, flake8-bugbear, flake8-builtins, flake8-debugger, flake8-docstrings, flake8-eradicate, flake8-mutable, flake8-pyproject, flake8-rst-docstrings
flake8-bugbear==24.4.26 # via -r requirements-dev.in
flake8-builtins==2.5.0 # via -r requirements-dev.in
flake8-debugger==4.1.2 # via -r requirements-dev.in
Expand All @@ -62,87 +61,85 @@ flake8-eradicate==1.5.0 # via -r requirements-dev.in
flake8-mutable==1.2.0 # via -r requirements-dev.in
flake8-pyproject==1.2.3 # via -r requirements-dev.in
flake8-rst-docstrings==0.3.0 # via -r requirements-dev.in
flask==3.0.3 # via dace
fonttools==4.51.0 # via matplotlib
fonttools==4.53.0 # via matplotlib
fparser==0.1.4 # via dace
frozendict==2.4.4 # via gt4py (pyproject.toml)
gridtools-cpp==2.3.2 # via gt4py (pyproject.toml)
hypothesis==6.102.1 # via -r requirements-dev.in, gt4py (pyproject.toml)
gridtools-cpp==2.3.4 # via gt4py (pyproject.toml)
hypothesis==6.104.1 # via -r requirements-dev.in, gt4py (pyproject.toml)
identify==2.5.36 # via pre-commit
idna==3.7 # via requests
imagesize==1.4.1 # via sphinx
importlib-metadata==7.1.0 # via build, flask, jax, jupyter-client, sphinx
importlib-metadata==8.0.0 # via build, jax, jupyter-client, sphinx
importlib-resources==6.4.0 ; 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.4 # via nbmake
ipython==8.12.3 # via ipykernel
isort==5.13.2 # via -r requirements-dev.in
itsdangerous==2.2.0 # via flask
jax==0.4.13 # via gt4py (pyproject.toml)
jaxlib==0.4.13 # via jax
jedi==0.19.1 # via ipython
jinja2==3.1.4 # via flask, gt4py (pyproject.toml), sphinx
jinja2==3.1.4 # via dace, gt4py (pyproject.toml), sphinx
jsonschema==4.22.0 # via nbformat
jsonschema-specifications==2023.12.1 # via jsonschema
jupyter-client==8.6.1 # via ipykernel, nbclient
jupyter-client==8.6.2 # via ipykernel, nbclient
jupyter-core==5.7.2 # via ipykernel, jupyter-client, nbformat
jupytext==1.16.2 # via -r requirements-dev.in
kiwisolver==1.4.5 # via matplotlib
lark==1.1.9 # 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, werkzeug
markupsafe==2.1.5 # via jinja2, mako
matplotlib==3.7.5 # via -r requirements-dev.in
matplotlib-inline==0.1.7 # via ipykernel, ipython
mccabe==0.7.0 # via flake8
mdit-py-plugins==0.4.1 # via jupytext
mdurl==0.1.2 # via markdown-it-py
ml-dtypes==0.2.0 # via jax, jaxlib
mpmath==1.3.0 # via sympy
mypy==1.10.0 # via -r requirements-dev.in
mypy==1.10.1 # via -r requirements-dev.in
mypy-extensions==1.0.0 # via black, mypy
nanobind==1.9.2 # via gt4py (pyproject.toml)
nanobind==2.0.0 # via gt4py (pyproject.toml)
nbclient==0.6.8 # via nbmake
nbformat==5.10.4 # via jupytext, nbclient, nbmake
nbmake==1.5.3 # via -r requirements-dev.in
nbmake==1.5.4 # via -r requirements-dev.in
nest-asyncio==1.6.0 # via ipykernel, nbclient
networkx==3.1 # via dace
ninja==1.11.1.1 # via gt4py (pyproject.toml)
nodeenv==1.8.0 # via pre-commit
nodeenv==1.9.1 # via pre-commit
numpy==1.24.4 # via contourpy, dace, gt4py (pyproject.toml), jax, jaxlib, matplotlib, ml-dtypes, opt-einsum, scipy, types-jack-client
opt-einsum==3.3.0 # via jax
ordered-set==4.1.0 # via deepdiff
packaging==24.0 # via black, build, gt4py (pyproject.toml), ipykernel, jupytext, matplotlib, pipdeptree, pyproject-api, pytest, pytest-factoryboy, setuptools-scm, sphinx, tox
packaging==24.1 # via black, build, gt4py (pyproject.toml), ipykernel, jupytext, matplotlib, pipdeptree, pyproject-api, pytest, pytest-factoryboy, setuptools-scm, sphinx, tox
parso==0.8.4 # via jedi
pathspec==0.12.1 # via black
pexpect==4.9.0 # via ipython
pickleshare==0.7.5 # via ipython
pillow==10.3.0 # via matplotlib
pip-tools==7.4.1 # via -r requirements-dev.in
pipdeptree==2.20.0 # via -r requirements-dev.in
pipdeptree==2.23.0 # via -r requirements-dev.in
pkgutil-resolve-name==1.3.10 # via jsonschema
platformdirs==4.2.1 # via black, jupyter-core, tox, virtualenv
platformdirs==4.2.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
psutil==5.9.8 # via -r requirements-dev.in, ipykernel, pytest-xdist
psutil==6.0.0 # via -r requirements-dev.in, ipykernel, pytest-xdist
ptyprocess==0.7.0 # via pexpect
pure-eval==0.2.2 # via stack-data
pybind11==2.12.0 # via gt4py (pyproject.toml)
pycodestyle==2.11.1 # via flake8, flake8-debugger
pybind11==2.13.1 # via gt4py (pyproject.toml)
pycodestyle==2.12.0 # via flake8, flake8-debugger
pycparser==2.22 # via cffi
pydantic==2.7.1 # via bump-my-version, pydantic-settings
pydantic-core==2.18.2 # via pydantic
pydantic-settings==2.2.1 # via bump-my-version
pydantic==2.7.4 # via bump-my-version, pydantic-settings
pydantic-core==2.18.4 # via pydantic
pydantic-settings==2.3.4 # via bump-my-version
pydocstyle==6.3.0 # via flake8-docstrings
pyflakes==3.2.0 # via flake8
pygments==2.18.0 # via -r requirements-dev.in, devtools, flake8-rst-docstrings, ipython, nbmake, rich, sphinx
pyparsing==3.1.2 # via matplotlib
pyproject-api==1.6.1 # via tox
pyproject-api==1.7.1 # via tox
pyproject-hooks==1.1.0 # via build, pip-tools
pytest==8.2.0 # via -r requirements-dev.in, gt4py (pyproject.toml), nbmake, pytest-cache, pytest-cov, pytest-factoryboy, pytest-instafail, pytest-xdist
pytest==8.2.2 # via -r requirements-dev.in, gt4py (pyproject.toml), nbmake, pytest-cache, pytest-cov, 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-factoryboy==2.7.0 # via -r requirements-dev.in
Expand All @@ -155,12 +152,12 @@ pyyaml==6.0.1 # via dace, jupytext, pre-commit
pyzmq==26.0.3 # via ipykernel, jupyter-client
questionary==2.0.1 # via bump-my-version
referencing==0.35.1 # via jsonschema, jsonschema-specifications
requests==2.31.0 # via dace, sphinx
requests==2.32.3 # via sphinx
restructuredtext-lint==1.4.0 # via flake8-rst-docstrings
rich==13.7.1 # via bump-my-version, rich-click
rich-click==1.8.2 # via bump-my-version
rich-click==1.8.3 # via bump-my-version
rpds-py==0.18.1 # via jsonschema, referencing
ruff==0.4.4 # via -r requirements-dev.in
ruff==0.4.10 # via -r requirements-dev.in
scipy==1.10.1 # via gt4py (pyproject.toml), jax, jaxlib
setuptools-scm==8.1.0 # via fparser
six==1.16.0 # via asttokens, astunparse, python-dateutil
Expand All @@ -176,15 +173,15 @@ 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
sympy==1.9 # via dace, gt4py (pyproject.toml)
sympy==1.12.1 # via dace, gt4py (pyproject.toml)
tabulate==0.9.0 # via gt4py (pyproject.toml)
tomli==2.0.1 ; python_version < "3.11" # via -r requirements-dev.in, black, build, coverage, flake8-pyproject, jupytext, mypy, pip-tools, pyproject-api, pytest, setuptools-scm, tox
tomlkit==0.12.5 # via bump-my-version
toolz==0.12.1 # via cytoolz
tornado==6.4 # via ipykernel, jupyter-client
tox==4.15.0 # via -r requirements-dev.in
tornado==6.4.1 # via ipykernel, jupyter-client
tox==4.15.1 # via -r requirements-dev.in
traitlets==5.14.3 # via comm, ipykernel, ipython, jupyter-client, jupyter-core, matplotlib-inline, nbclient, nbformat
types-aiofiles==23.2.0.20240403 # via types-all
types-aiofiles==24.1.0.20240626 # via types-all
types-all==1.0.0 # via -r requirements-dev.in
types-annoy==1.17.8.4 # via types-all
types-atomicwrites==1.4.5.1 # via types-all
Expand Down Expand Up @@ -236,16 +233,16 @@ types-openssl-python==0.1.3 # via types-all
types-orjson==3.6.2 # via types-all
types-paramiko==3.4.0.20240423 # via types-all, types-pysftp
types-pathlib2==2.3.0 # via types-all
types-pillow==10.2.0.20240511 # via types-all
types-pillow==10.2.0.20240520 # via types-all
types-pkg-resources==0.1.3 # via types-all
types-polib==1.2.0.20240327 # via types-all
types-protobuf==5.26.0.20240422 # via types-all
types-pyaudio==0.2.16.20240425 # via types-all
types-protobuf==5.27.0.20240626 # via types-all
types-pyaudio==0.2.16.20240516 # via types-all
types-pycurl==7.45.3.20240421 # via types-all
types-pyfarmhash==0.3.1.20240311 # via types-all
types-pyjwt==1.7.1 # via types-all
types-pymssql==2.1.0 # via types-all
types-pymysql==1.1.0.20240425 # via types-all
types-pymysql==1.1.0.20240524 # via types-all
types-pyopenssl==24.1.0.20240425 # via types-redis
types-pyrfc3339==1.1.1.5 # via types-all
types-pysftp==0.2.17.20240106 # via types-all
Expand All @@ -256,11 +253,11 @@ types-pytz==2024.1.0.20240417 # via types-all, types-tzlocal
types-pyvmomi==8.0.0.6 # via types-all
types-pyyaml==6.0.12.20240311 # via types-all
types-redis==4.6.0.20240425 # via types-all
types-requests==2.31.0.20240406 # via types-all
types-requests==2.32.0.20240622 # via types-all
types-retry==0.9.9.4 # via types-all
types-routes==2.5.0 # via types-all
types-scribe==2.0.0 # via types-all
types-setuptools==69.5.0.20240513 # via types-cffi
types-setuptools==70.1.0.20240627 # via types-cffi
types-simplejson==3.19.0.20240310 # via types-all
types-singledispatch==4.1.0.0 # via types-all
types-six==1.16.21.20240513 # via types-all
Expand All @@ -270,21 +267,20 @@ types-toml==0.10.8.20240310 # via types-all
types-tornado==5.1.1 # via types-all
types-typed-ast==1.5.8.7 # via types-all
types-tzlocal==5.1.0.1 # via types-all
types-ujson==5.9.0.0 # via types-all
types-ujson==5.10.0.20240515 # via types-all
types-waitress==3.0.0.20240423 # via types-all
types-werkzeug==1.0.9 # via types-all, types-flask
types-xxhash==3.0.5.2 # via types-all
typing-extensions==4.11.0 # via annotated-types, black, gt4py (pyproject.toml), ipython, mypy, pydantic, pydantic-core, pytest-factoryboy, rich, rich-click, setuptools-scm
urllib3==2.2.1 # via requests, types-requests
virtualenv==20.26.2 # via pre-commit, tox
wcmatch==8.5.1 # via bump-my-version
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, types-requests
virtualenv==20.26.3 # via pre-commit, tox
wcmatch==8.5.2 # via bump-my-version
wcwidth==0.2.13 # via prompt-toolkit
websockets==12.0 # via dace
werkzeug==3.0.3 # via flask
wheel==0.43.0 # via astunparse, pip-tools
xxhash==3.0.0 # via gt4py (pyproject.toml)
zipp==3.18.1 # via importlib-metadata, importlib-resources
zipp==3.19.2 # via importlib-metadata, importlib-resources

# The following packages are considered to be unsafe in a requirements file:
pip==24.0 # via pip-tools, pipdeptree
setuptools==69.5.1 # via gt4py (pyproject.toml), nodeenv, pip-tools, setuptools-scm
pip==24.1.1 # via pip-tools, pipdeptree
setuptools==70.1.1 # via gt4py (pyproject.toml), pip-tools, setuptools-scm
Loading

0 comments on commit f7ac3d8

Please sign in to comment.