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.

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

LFRic: (Closes #2189) fix bugs with missing maps in enter data directive #2199

Merged
merged 23 commits into from
Sep 29, 2023

Conversation

arporter
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Jun 29, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (f78be5c) 99.84% compared to head (56ad083) 99.84%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2199      +/-   ##
==========================================
- Coverage   99.84%   99.84%   -0.01%     
==========================================
  Files         343      343              
  Lines       45929    45926       -3     
==========================================
- Hits        45858    45855       -3     
  Misses         71       71              
Files Coverage Δ
...rc/psyclone/domain/lfric/kern_call_acc_arg_list.py 100.00% <100.00%> (ø)
src/psyclone/domain/lfric/kern_call_arg_list.py 100.00% <100.00%> (ø)
src/psyclone/dynamo0p3.py 99.81% <100.00%> (+<0.01%) ⬆️
src/psyclone/tests/dependency_test.py 99.51% <100.00%> (-0.06%) ⬇️
src/psyclone/tests/dynamo0p3_basis_test.py 99.02% <ø> (-0.01%) ⬇️
src/psyclone/tests/dynamo0p3_multigrid_test.py 100.00% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@arporter arporter marked this pull request as draft June 29, 2023 14:29
@arporter
Copy link
Member Author

arporter commented Jun 29, 2023

Although this fixes the bug, it does not address the missing arrays used to look-up loop limits. This doesn't actually seem to be a problem as presumably they're not part of the kernel launch. However, I'm wondering whether it would be better to do this as part of #2157 which is redoing this whole thing properly.
EDIT: have looked in detail there's actually no overlap as things are still done differently in the LFRic API (the PSyIR dependence analysis is not used). Therefore, I'll keep this one separate.

@arporter arporter temporarily deployed to integration June 30, 2023 08:43 — with GitHub Actions Inactive
@arporter arporter marked this pull request as ready for review June 30, 2023 08:43
@arporter
Copy link
Member Author

This PR fixes a bug in the openacc 'enter data' generation for inter-grid LFRic kernels - the wrong cell map was being provided to the directive. Ready for review. Probably one for @rupertford as he's most familiar with this code but could also be @hiker, @sergisiso or @TeranIvy.

Copy link
Collaborator

@rupertford rupertford left a comment

Choose a reason for hiding this comment

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

Good stuff Andy, I have some questions and comments., most of which could come from my lack of understanding of the implementation.

src/psyclone/dynamo0p3.py Outdated Show resolved Hide resolved
src/psyclone/domain/lfric/kern_call_acc_arg_list.py Outdated Show resolved Hide resolved
src/psyclone/domain/lfric/kern_call_acc_arg_list.py Outdated Show resolved Hide resolved
src/psyclone/dynamo0p3.py Show resolved Hide resolved
Copy link
Collaborator

@rupertford rupertford left a comment

Choose a reason for hiding this comment

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

Just a few very minor issues now.

src/psyclone/dynamo0p3.py Outdated Show resolved Hide resolved
@arporter arporter temporarily deployed to integration August 16, 2023 09:02 — with GitHub Actions Inactive
@arporter
Copy link
Member Author

CI-permitting this is ready for another look. I've just fired-off the integration tests too.

@arporter
Copy link
Member Author

@rupertford, just a nudge to say I could do with this when you're feeling up to doing a review :-)

@rupertford rupertford temporarily deployed to integration September 28, 2023 19:17 — with GitHub Actions Inactive
Copy link
Collaborator

@rupertford rupertford left a comment

Choose a reason for hiding this comment

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

All outstanding issues have been addressed. CI is happy. Integration tests are happy. There is no performance degradation in integration tests. Approving.

@rupertford rupertford added Blocked An issue/PR that is blocked by one or more issues/PRs. and removed under review labels Sep 28, 2023
@rupertford
Copy link
Collaborator

Waiting for new release until adding to master as Iva has completed her tests.

@rupertford rupertford added ready to be merged and removed Blocked An issue/PR that is blocked by one or more issues/PRs. labels Sep 29, 2023
@rupertford rupertford merged commit 0a8bc3e into master Sep 29, 2023
11 checks passed
@rupertford rupertford deleted the 2189_enter_data_cell_map branch September 29, 2023 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug LFRic Issue relates to the LFRic domain ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants