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

Type aliases for Fields #473

Merged
merged 37 commits into from
Jul 29, 2024
Merged

Type aliases for Fields #473

merged 37 commits into from
Jul 29, 2024

Conversation

nfarabullini
Copy link
Contributor

@nfarabullini nfarabullini commented May 31, 2024 •
edited
Loading

Introduction of Type Aliases for Fields of global dimensions

CellField -> Field[[CellDim], dtype]
EdgeField -> Field[[EdgeDim], dtype]
VertexField -> Field[[VertexDim], dtype]
KField -> Field[[KDim], dtype]

CellKField -> Field[[CellDim, KDim], dtype]
EdgeKField -> Field[[EdgeDim, KDim], dtype]
VertexKField -> Field[[VertexDim, KDim], dtype]

@nfarabullini
introduction of fields type aliases and partial implementation
0472a13
@nfarabullini
fields type aliases partial implementation
7c3ee6c
@nfarabullini
Field[[EdgeDim, KDim], wpfloat] -> EKwpField
80f8dbf
@nfarabullini
Field[[KDim], int32] -> KintField
33bbafb
@nfarabullini
Field[[EdgeDim, KDim], bool] -> EKboolField
9381bdc
@nfarabullini
Field[[CellDim], bool] -> CboolField
d46cfc2
@nfarabullini
Field[[EdgeDim, KDim], int32] -> EKintField
4dc27fa
@nfarabullini
Field[[EdgeDim, KDim], int32] -> EKintField
85dab66
@nfarabullini
Field[[CellDim], int32] -> CintField
88b8fb2
@nfarabullini
Field[[CellDim, KDim], vpfloat] -> CKvpField
01df8d8
@nfarabullini
left-overs
8140c47
@nfarabullini
Field[[KDim], wpfloat] -> KwpField
c4f181e
@nfarabullini
small edit
675f1da
@nfarabullini
Field[[CellDim, KDim], float] -> CKfloatField and file rename
4011992
@nfarabullini
Field[[EdgeDim, KDim], float] -> EKfloatField and file rename
17030ff
@nfarabullini
Field[[CellDim], float] -> CfloatField
e9696ef
@nfarabullini
Field[[EdgeDim], float] -> EfloatField and Field[[KDim], float] -> Kf…
5a5d2a6 
…loatField
@nfarabullini
Field[[EdgeDim, KDim], vpfloat] -> EKvpField and Field[[VertexDim, KD…
db641cd 
…im], vpfloat] -> VKvpField
@nfarabullini
Field[[EdgeDim, KDim], vpfloat] -> EKvpField and Field[[VertexDim, KD…
efeb00b 
…im], vpfloat] -> VKvpField
@nfarabullini
Field[[CellDim, KDim], bool] -> CKboolField and Field[[CellDim, KDim]…
bb56208 
…, int32] -> CKintField
@nfarabullini nfarabullini changed the title Introduce type alias fields Type aliases for Fields May 31, 2024
@nfarabullini
Copy link
Contributor Author

cscs-ci run default

@nfarabullini
Copy link
Contributor Author

launch jenkins spack

@halungge halungge self-requested a review June 10, 2024 09:49
halungge
halungge requested changes Jun 10, 2024
View reviewed changes
Copy link
Contributor

@halungge halungge left a comment

Choose a reason for hiding this comment

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

Can you also run the ICON integration action with this branch?
launch jenkins icon

model/common/src/icon4py/model/common/field_type_aliases.py Outdated Show resolved Hide resolved
model/common/src/icon4py/model/common/field_type_aliases.py Outdated Show resolved Hide resolved
@nfarabullini
Copy link
Contributor Author

launch jenkins icon

@nfarabullini
Copy link
Contributor Author

cscs-ci run default

@nfarabullini
Copy link
Contributor Author

launch jenkins spack

@nfarabullini
Copy link
Contributor Author

launch jenkins icon

@nfarabullini
Copy link
Contributor Author

launch jenkins icon

@nfarabullini
Copy link
Contributor Author

cscs-ci run default

@nfarabullini
Copy link
Contributor Author

launch jenkins spack

@nfarabullini
Copy link
Contributor Author

cscs-ci run default

@nfarabullini
Copy link
Contributor Author

launch jenkins spack

@nfarabullini
Copy link
Contributor Author

cscs-ci run default

@nfarabullini
Copy link
Contributor Author

launch jenkins spack

@nfarabullini
Copy link
Contributor Author

launch jenkins icon

1 similar comment
@nfarabullini
Copy link
Contributor Author

launch jenkins icon

@nfarabullini
Copy link
Contributor Author

launch jenkins spack

halungge
halungge approved these changes Jul 26, 2024
View reviewed changes
Copy link
Contributor

@halungge halungge left a comment

Choose a reason for hiding this comment

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

Three very small things, like typos, mostly not even by you but can you fix them before mergeing? Thanks.

model/common/src/icon4py/model/common/test_utils/serialbox_utils.py
@@ -904,7 +904,7 @@ def exner_dyn_incr(self):
def scal_divdamp_o2(self) -> float:
return self.serializer.read("scal_divdamp_o2", self.savepoint)[0]

def scal_divdamp(self) -> Field[[KDim], float]:
def scal_divdamp(self):
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did you remove the type annotation here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

for consistency with all other methods, which do not have a return type

...odel/atmosphere/dycore/compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py Outdated Show resolved Hide resolved
model/common/src/icon4py/model/common/states/prognostic_state.py Outdated Show resolved Hide resolved
@nfarabullini
Copy link
Contributor Author

cscs-ci run default

@github-actions GitHub Actions
Copy link

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

To run tests and benchmarks with the DaCe backend you can use:

  • cscs-ci run dace

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.

@nfarabullini
Copy link
Contributor Author

launch jenkins icon

@nfarabullini
Copy link
Contributor Author

launch jenkins spack

@nfarabullini nfarabullini merged commit 3d1e928 into main Jul 29, 2024
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@halungge halungge halungge approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@nfarabullini @halungge