(closes #3243) Unify and document nemo scritps #3244

sergisiso · 2025-12-02T10:11:29Z

Unifies omp_gpu_trans.py omp_cpu_trans.py and acc_loops_trans.py
Adds a new README (https://github.com/stfc/PSyclone/tree/single_nemo_script/examples/nemo/scripts)
Switch one of the NEMOv5 ORCA test from OpenMP to OpenACC loops to have coverage of both
Improve performance of NEMOv5 (NEMOv4 got a regression needed to get full reproducibility)
Require full reproducibility of remaining nemo (loop) tests

…ation' into single_nemo_script

…MOv5

codecov · 2025-12-02T10:22:15Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 99.91%. Comparing base (97dd02d) to head (bc5d55f).

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #3244   +/-   ##
=======================================
  Coverage   99.91%   99.91%           
=======================================
  Files         376      376           
  Lines       53529    53543   +14     
=======================================
+ Hits        53484    53498   +14     
  Misses         45       45

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

sergisiso · 2025-12-03T16:25:40Z

@arporter This is ready for a first review. See top PR description for the things that this PR attempts.

LonelyCat124

Hi @sergisiso
Overall looks fine, few typos in the examples which I think means they won't have been tested with the new changes. Can you fix that up and then rerun the integration to check they all run correctly with the GPU enabled.

LonelyCat124 · 2025-12-09T13:14:41Z

examples/nemo/eg1/Makefile

 	${PSYCLONE} -s ./openmp_gpu_levels_trans.py ../code/tra_adv.F90
-	${PSYCLONE} -s ../scripts/omp_cpu_trans.py ../code/tra_adv.F90
-	${PSYCLONE} -s ../scripts/omp_gpu_trans.py ../code/tra_adv.F90
+	PARALLEL_DIRECTICVES="omp_threading" ${PSYCLONE} -s ../scripts/insert_loop_parallelism.py ../code/tra_adv.F90


This should be PARLLEL_DIRECTIVES I think.

LonelyCat124 · 2025-12-09T13:17:55Z

examples/nemo/eg2/Makefile

 	${PSYCLONE} -s ./omp_levels_trans.py ../code/traldf_iso.F90
-	${PSYCLONE} -s ../scripts/omp_cpu_trans.py ../code/traldf_iso.F90
-	${PSYCLONE} -s ../scripts/omp_gpu_trans.py ../code/traldf_iso.F90
+	PARALLEL_DIRECTICVES="omp_threading" ${PSYCLONE} -s ../scripts/insert_loop_parallelism.py ../code/traldf_iso.F90


Also should be DIRECTIVES

LonelyCat124 · 2025-12-09T13:18:23Z

examples/nemo/scripts/README.md

+> but these are pinned to a particular release of PSyclone and have constraints
+> defined in `mk/sct_psyclone.sh` script. By contrast, the process presented in
+> this README uses the experimental `psyclonefc` compiler wrapper command which
+> bypases the `makenemo -p` and instead intercepts any compilation command and


LonelyCat124 · 2025-12-09T13:28:16Z

examples/nemo/scripts/README.md

+compile, but the results will diverge. This gets more complicated with parallel
+programming because certain operations like reductions or atomics are not
+always reproducible. Therefore, to understand what causes the results divergence
+it is usefulk to apply the transformations step-by-step while checking if the


s/usefulk/useful/

LonelyCat124 · 2025-12-09T13:29:30Z

examples/nemo/scripts/README.md

+  and see if the results still match.
+- Finally, run it with `REPRODUCIBLE=1 PARALLEL_DIRECTIVES="omp_offloading" PSYCLONE_OPTS="-s insert_loop_parallelism.py"`
+
+Orthogonally to finding which step is causing the divergence we may want to find


I think "Alongside finding which step is causing the divergence" might be more appropriate? These feel like related steps not opposed to me.

I agree, updated

LonelyCat124 · 2025-12-09T13:31:31Z

examples/nemo/scripts/README.md

+In addition to the source, you can also modify the recipe that psyclone uses to
+transform the code. In this example you can do so by changing any detail of the
+`insert_loop_parallelism.py` transformation script, but the `FILES_TO_SKIP`
+global variable is particularly relevant as it allows psyclone skip processing


s/psyclone/PSyclone/

Similarly below.

Updated several instances of this in this file

LonelyCat124 · 2025-12-09T13:39:54Z

examples/nemo/scripts/utils.py

-            except TransformationError:
-                pass
+        if filename == "fldread.f90":
+            # TODO #2951: This file has issues converting SturctureRefs


s/Sturcture/Structure

LonelyCat124 · 2025-12-09T13:40:06Z

examples/nemo/scripts/utils.py

+        if filename == "fldread.f90":
+            # TODO #2951: This file has issues converting SturctureRefs
+            pass
+        elif nemo_v4 and filename == "dynspg_ts.f90":


Comment on skipping this file?

I created the relevant issue and added a TODO here

sergisiso · 2025-12-27T19:14:56Z

@LonelyCat124 This is ready for another review

sergisiso and others added 26 commits October 15, 2025 10:10

Start updating nemo README

6000775

Merge branch 'unresolved_as_calls' into single_nemo_script

ac6df07

Merge branch 'unresolved_as_calls' into single_nemo_script

85e7249

Update NEMO readmes

48f0a8c

Add initial version of the unified insert_loop_parallelism.py script

a9618c0

Fixes to NEMO insert_loop_parallelism.py

525e111

Merge branch 'unresolved_as_calls' into single_nemo_script

8cc4582

Remove NEMO omp_cpu_trans.py

d037cc0

Replace NEMO omp_gpu_trans.py

394f8f3

Fix some issues with new NEMO script

6fd4de1

Attempt to fix issues with NEMO OpenACC

6a89eb9

Add allow_strings validation option to ACCParallel

2252a48

Merge remote-tracking branch 'origin/3188_tighten_privatisation_valid…

eeb2b10

…ation' into single_nemo_script

Exlcude icb from NEMO insert_loop_parallelism and skip failing async

73fb247

Reorder NEMO readme and add section about identifying problems

6607aec

Update NEMO README

1e57470

Update NEMO script to only exclude files with offloading issues in NE…

aea4c0e

…MOv5

Replace acc_loop_trans in NEMOv4 test

782a163

Remove unneeded NEMO flag

ca2c06e

Fix wrong path in NEMO integration test

1e52822

Bring unresolved_as_calls changes

d767908

Small change of location of NEMO utils.py conditional

0a7c24f

Bring unresolved_as_calls changes

46980be

Merge branch 'unresolved_as_calls' into single_nemo_script

0b6366d

Merge branch 'unresolved_as_calls' into single_nemo_script

b29c66f

Fix issues with CI and integration tests

98f5dca

sergisiso added 3 commits December 2, 2025 11:54

In ECMWF NEMOv4 include mpif.h during cpp

71270ce

Test ACCParallelTrans allow_strings

0b80c98

Add no-vectorize and no-fma to the NEMOv5 gcc reproducible checks

9125e6a

Merge remote-tracking branch 'origin/master' into single_nemo_script

628a1cc

LonelyCat124 requested changes Dec 9, 2025

View reviewed changes

LonelyCat124 added reviewed with actions and removed ready for review labels Dec 9, 2025

#3244 Fix typos and add TODO

4f92604

sergisiso temporarily deployed to integration December 11, 2025 16:42 — with GitHub Actions Inactive

#2144 Try to improve hybrid performance

1a177d2

sergisiso temporarily deployed to integration December 15, 2025 09:35 — with GitHub Actions Inactive

#3244 Revert last changes and don't collapse CPU loops

32057f1

sergisiso temporarily deployed to integration December 15, 2025 11:40 — with GitHub Actions Inactive

sergisiso added 2 commits December 15, 2025 15:40

Bring to master

f0f5413

Merge remote-tracking branch 'origin/master' into single_nemo_script

1fc199e

sergisiso added ready for review and removed reviewed with actions labels Dec 27, 2025

sergisiso temporarily deployed to integration December 31, 2025 10:40 — with GitHub Actions Inactive

sergisiso added in progress and removed ready for review labels Dec 31, 2025

sergisiso temporarily deployed to integration December 31, 2025 17:24 — with GitHub Actions Inactive

sergisiso temporarily deployed to integration December 31, 2025 18:46 — with GitHub Actions Inactive

sergisiso temporarily deployed to integration January 1, 2026 10:30 — with GitHub Actions Inactive

sergisiso force-pushed the single_nemo_script branch from bc5d55f to 1fc199e Compare January 1, 2026 11:00

sergisiso temporarily deployed to integration January 1, 2026 11:03 — with GitHub Actions Inactive

sergisiso added ready for review and removed in progress labels Jan 1, 2026

arporter added under review ready for review and removed ready for review under review labels Jan 5, 2026

(closes #3243) Unify and document nemo scritps #3244

Are you sure you want to change the base?

(closes #3243) Unify and document nemo scritps #3244

Conversation

sergisiso commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sergisiso commented Dec 3, 2025

Uh oh!

LonelyCat124 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sergisiso commented Dec 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

sergisiso commented Dec 2, 2025 •

edited

Loading

codecov bot commented Dec 2, 2025 •

edited

Loading