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

Jump to bottom

Allow multipe field operators in program, pass array sizes to bindings gen, integrate fused vel_adv 1_to_7 and 8_to_13 #261

Merged
merged 212 commits into from
Feb 8, 2024
Merged

Allow multipe field operators in program, pass array sizes to bindings gen, integrate fused vel_adv 1_to_7 and 8_to_13 #261

merged 212 commits into from
Feb 8, 2024

Conversation

muellch
Copy link
Contributor

@muellch muellch commented Aug 24, 2023 •
edited
Loading

  • Allow multiple field operators per program in order to handle nlevp1 and nlev fields to be computed in the same program.
  • Change bindings gen so it asks output fields of stencils in Fortran for their vertical length.
  • Integrate fused velocity advection stencils 1_to_7 and 8_to_13.

samkellerhals and others added 30 commits June 1, 2023 16:53
@samkellerhals
Add model
d96726f
@samkellerhals
Fix import paths
349eed3
@samkellerhals
Add precommit config files
b96eb89
@samkellerhals
Modify tox config
cf94837
@samkellerhals
Update github workflows
aa6b9d0
@samkellerhals
Update icon4py qa workflow
e194978
@samkellerhals
add working directory
866a057
@samkellerhals
more changes
1a55ffc
@samkellerhals
Pass config file to flake8
8e1f16a
@samkellerhals
Update flake8 path
d3450c8
@samkellerhals
run formatting
bf96c79
@samkellerhals
Update pyproject.toml
7fa799a
@samkellerhals
Allow coverage to fail if no report is available
11882e6
@samkellerhals
Use working directory only for install job
b4380dc
@samkellerhals @egparedes
Update model/atm_dyn_iconam/pyproject.toml
a34490e 
Co-authored-by: Enrique G. Paredes <18477+egparedes@users.noreply.github.com>
@samkellerhals @egparedes
Update model/common/pyproject.toml
c146d24 
Co-authored-by: Enrique G. Paredes <18477+egparedes@users.noreply.github.com>
@samkellerhals
Reformat
71b832f
@samkellerhals
Add version for atm_dyn_iconam and common
232b8b8
@samkellerhals
Add qa to common
65c0cff
@samkellerhals @egparedes
Update model/atm_dyn_iconam/tox.ini
68bf4de 
Co-authored-by: Enrique G. Paredes <18477+egparedes@users.noreply.github.com>
@samkellerhals @egparedes
Update model/common/tox.ini
2b76771 
Co-authored-by: Enrique G. Paredes <18477+egparedes@users.noreply.github.com>
@samkellerhals @egparedes
Update model/common/tox.ini
a87227e 
Co-authored-by: Enrique G. Paredes <18477+egparedes@users.noreply.github.com>
@samkellerhals
add icon4py model qualified name
e59ff17
@samkellerhals
Add icon4py-common to github workflows
eac0e5c
@samkellerhals
Reformat
d8cfc9a
@samkellerhals
Remove PIP_SRC
61632b3
@samkellerhals
Allow pytest to fail in icon4py.model.common
3d27334
@samkellerhals @egparedes
Update .github/workflows/icon4py-qa.yml
dc1a42b 
Co-authored-by: Enrique G. Paredes <18477+egparedes@users.noreply.github.com>
@samkellerhals @egparedes
Update .github/workflows/icon4py-qa.yml
3b2dff5 
Co-authored-by: Enrique G. Paredes <18477+egparedes@users.noreply.github.com>
@samkellerhals @egparedes
Update .github/workflows/icon4py-tox.yml
aab2be0 
Co-authored-by: Enrique G. Paredes <18477+egparedes@users.noreply.github.com>
@muellch
Merge branch 'main' into array_size_bindings
73f9fee 
Conflicts:
	model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_1_to_7.py
	model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_14.py
	model/atmosphere/dycore/tests/dycore_stencil_tests/test_extrapolate_at_top.py
	model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_1_to_7.py
	model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py
@muellch
Merge branch 'main' into array_size_bindings
37b758e
@muellch
Copy link
Contributor Author

muellch commented Jan 31, 2024

cscs-ci run

@muellch
Copy link
Contributor Author

muellch commented Jan 31, 2024

cscs-ci run default

@muellch
Copy link
Contributor Author

muellch commented Feb 1, 2024

cscs-ci run default

1 similar comment
@muellch
Copy link
Contributor Author

muellch commented Feb 1, 2024

cscs-ci run default

@muellch
Merge branch 'main' into array_size_bindings
88b404c 
Conflicts:
	model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_1_to_7.py
	model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_1_to_7.py
	model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py
@muellch
Copy link
Contributor Author

muellch commented Feb 1, 2024

cscs-ci run default

1 similar comment
@muellch
Copy link
Contributor Author

muellch commented Feb 2, 2024

cscs-ci run default

@muellch
Copy link
Contributor Author

muellch commented Feb 2, 2024

launch jenkins spack

@muellch
Merge branch 'main' into array_size_bindings
ce4e05f 
Conflicts:
	model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_14.py
	model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py
	tools/src/icon4pytools/icon4pygen/backend.py
@muellch
Copy link
Contributor Author

muellch commented Feb 5, 2024

cscs-ci run default

@muellch
Copy link
Contributor Author

muellch commented Feb 7, 2024

cscs-ci run default

@muellch
Copy link
Contributor Author

muellch commented Feb 7, 2024

launch jenkins spack

muellch
muellch commented Feb 7, 2024
View reviewed changes
tools/src/icon4pytools/icon4pygen/backend.py
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I included your suggestions, thank you!

havogt
havogt approved these changes Feb 7, 2024
View reviewed changes
Copy link
Contributor

@havogt havogt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked mainly at the infrastructure code, not at the fused stencils?

samkellerhals
samkellerhals requested changes Feb 8, 2024
View reviewed changes
Copy link
Contributor

@samkellerhals samkellerhals left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I also looked mainly at the infrastructure code and not in detail at the fused stencils.

tools/tests/icon4pygen/test_metadata.py Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 8, 2024

Mandatory Tests

Please make sure you run these tests via comment before you merge!

  • cscs-ci run default
  • launch jenkins spack

Optional Tests

To run benchmarks you can use:

  • cscs-ci run benchmark

In case your change might affect downstream icon-exclaim, please consider running

  • launch jenkins icon

For more detailed information please look at CI in the EXCLAIM universe.

@muellch
Copy link
Contributor Author

muellch commented Feb 8, 2024

cscs-ci run default

@muellch
Copy link
Contributor Author

muellch commented Feb 8, 2024

launch jenkins spack

@muellch muellch merged commit a32640c into main Feb 8, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@havogt havogt havogt approved these changes

@samkellerhals samkellerhals samkellerhals approved these changes

@nfarabullini nfarabullini Awaiting requested review from nfarabullini

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@muellch @havogt @samkellerhals @nfarabullini @huppd