Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dace-gtir-iterator_view' into da…
Browse files Browse the repository at this point in the history
…ce-gtir-scan
  • Loading branch information
edopao committed Jan 10, 2025
2 parents 311c74e + fd1462d commit 8deaa16
Show file tree
Hide file tree
Showing 49 changed files with 452 additions and 618 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_disabled/gt4py-sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.10
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
daily-ci:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
tox-module-factor: ["cartesian", "eve", "next", "storage"]
os: ["ubuntu-latest"]
requirements-file: ["requirements-dev.txt", "min-requirements-test.txt", "min-extra-requirements-test.txt"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-cartesian-fallback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
tox-factor: [internal, dace]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-cartesian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
tox-factor: [internal, dace]
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-eve-fallback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
test-eve:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
os: ["ubuntu-latest"]

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-eve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
test-eve:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
os: ["ubuntu-latest"]
fail-fast: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-storage-fallback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
test-storage:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
tox-factor: [internal, dace]
os: ["ubuntu-latest"]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
test-storage:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
tox-factor: [internal, dace]
os: ["ubuntu-latest"]
fail-fast: false
Expand Down
28 changes: 13 additions & 15 deletions .pre-commit-config.yaml
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.2
rev: v0.8.6
##[[[end]]]
hooks:
# Run the linter.
Expand All @@ -72,9 +72,9 @@ repos:
## version = re.search('mypy==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"#========= FROM constraints.txt: v{version} =========")
##]]]
#========= FROM constraints.txt: v1.13.0 =========
#========= FROM constraints.txt: v1.14.1 =========
##[[[end]]]
rev: v1.13.0 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
rev: v1.14.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,31 +90,29 @@ repos:
## for pkg in packages:
## print(f"- {pkg}==" + str(re.search(f'\n{pkg}==([0-9\.]*)', constraints)[1]))
##]]]
- astunparse==1.6.3
- attrs==24.2.0
- black==24.8.0
- attrs==24.3.0
- black==24.10.0
- boltons==24.1.0
- cached-property==2.0.1
- click==8.1.7
- cmake==3.31.1
- cytoolz==1.0.0
- deepdiff==8.0.1
- click==8.1.8
- cmake==3.31.2
- 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
- frozendict==2.4.6
- gridtools-cpp==2.3.8
- importlib-resources==6.4.5
- jinja2==3.1.4
- jinja2==3.1.5
- lark==1.2.2
- mako==1.3.8
- nanobind==2.4.0
- ninja==1.11.1.2
- numpy==1.24.4
- ninja==1.11.1.3
- numpy==1.26.4
- packaging==24.2
- pybind11==2.13.6
- setuptools==75.3.0
- setuptools==75.8.0
- tabulate==0.9.0
- typing-extensions==4.12.2
- xxhash==3.0.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

GT4Py is a Python library for generating high performance implementations of stencil kernels from a high-level definition using regular Python functions. GT4Py is part of the GridTools framework, a set of libraries and utilities to develop performance portable applications in the area of weather and climate modeling.

**NOTE:** The `gt4py.next` subpackage contains a new version of GT4Py which is not compatible with the current _stable_ version defined in `gt4py.cartesian`. The new version is highly experimental, it only works with unstructured meshes and it requires `python >= 3.10`.
**NOTE:** The `gt4py.next` subpackage contains a new version of GT4Py which is not compatible with the current _stable_ version defined in `gt4py.cartesian`. The new version is still experimental.

## 📃 Description

Expand Down
55 changes: 0 additions & 55 deletions ci/cscs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ include:
PYVERSION_PREFIX: py310
PYVERSION: 3.10.9

.py39: &py39
PYVERSION_PREFIX: py39
PYVERSION: 3.9.1

.py38: &py38
PYVERSION_PREFIX: py38
PYVERSION: 3.8.5

stages:
- baseimage
Expand Down Expand Up @@ -78,20 +71,6 @@ build_py310_baseimage_aarch64:
variables:
<<: *py310

build_py39_baseimage_x86_64:
extends: .build_baseimage_x86_64
variables:
<<: *py39
build_py39_baseimage_aarch64:
extends: .build_baseimage_aarch64
variables:
<<: *py39

build_py38_baseimage_x86_64:
extends: .build_baseimage_x86_64
variables:
<<: *py38


.build_image:
stage: image
Expand Down Expand Up @@ -128,23 +107,6 @@ build_py310_image_aarch64:
variables:
<<: *py310

build_py39_image_x86_64:
extends: .build_image_x86_64
needs: [build_py39_baseimage_x86_64]
variables:
<<: *py39
build_py39_image_aarch64:
extends: .build_image_aarch64
needs: [build_py39_baseimage_aarch64]
variables:
<<: *py39

build_py38_image_x86_64:
extends: .build_image_x86_64
needs: [build_py38_baseimage_x86_64]
variables:
<<: *py38


.test_helper:
stage: test
Expand Down Expand Up @@ -210,20 +172,3 @@ test_py310_aarch64:
needs: [build_py310_image_aarch64]
variables:
<<: *py310

test_py39_x86_64:
extends: [.test_helper_x86_64]
needs: [build_py39_image_x86_64]
variables:
<<: *py39
test_py39_aarch64:
extends: [.test_helper_aarch64]
needs: [build_py39_image_aarch64]
variables:
<<: *py39

test_py38_x86_64:
extends: [.test_helper_x86_64]
needs: [build_py38_image_x86_64]
variables:
<<: *py38
Loading

0 comments on commit 8deaa16

Please sign in to comment.