Skip to content

Add keep comments to PSYCLONE_OPTS in NEMOv4 and v5 integration tests #3511

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

Merged
sergisiso merged 9 commits into from
Oct 19, 2026
Merged

Add keep comments to PSYCLONE_OPTS in NEMOv4 and v5 integration tests #3511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
379e615
Add --keep-comments command line option to psyclone_opts in nemo v5 t…
victoria-atkinson Jul 30, 2026
a6113fb
Add --keep-comments command line option to psyclone_opts in nemo tests
victoria-atkinson Jul 30, 2026
1e34eeb
Merge remote-tracking branch 'origin/master' into keep-comments-nemo-…
victoria-atkinson Aug 11, 2026
8cbd4c4
Merge remote-tracking branch 'origin/master' into keep-comments-nemo-…
victoria-atkinson Sep 3, 2026
2e879df
Merge remote-tracking branch 'origin/master' into keep-comments-nemo-…
victoria-atkinson Oct 1, 2026
cef06d1
Merge remote-tracking branch 'origin/master' into keep-comments-nemo-…
victoria-atkinson Oct 14, 2026
5a76c03
Merge remote-tracking branch 'origin/master' into keep-comments-nemo-…
sergisiso Oct 19, 2026
f8c6d22
Update changelog
sergisiso Oct 19, 2026
b0fac65
Bring to master
sergisiso Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/nemo_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ jobs:
export MPIF90=psyclonefc
export PARALLEL_DIRECTIVES="acc_offloading"
export REPRODUCIBLE=1
export PSYCLONE_OPTS="--enable-cache -l output -s ${PSYCLONE_NEMO_DIR}/insert_loop_parallelism.py"
export PSYCLONE_OPTS="--keep-comments --enable-cache -l output -s ${PSYCLONE_NEMO_DIR}/insert_loop_parallelism.py"
export FCFLAGS="-i4 -Mr8 -O2 -Mnovect -Mnofma -g -acc -mp=gpu -gpu=mem:managed,math_uniform"
export NEMOV4=1 # Enables specific NEMOV4 exclusions in the PSyclone transformation script

Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
export PSYCLONE_COMPILER=$MPIF90
export MPIF90=psyclonefc
export PARALLEL_DIRECTIVES="omp_threading"
export PSYCLONE_OPTS="--enable-cache -l output -s ${PSYCLONE_NEMO_DIR}/insert_loop_parallelism.py -I ${MPI_HOME}/include"
export PSYCLONE_OPTS="--keep-comments --enable-cache -l output -s ${PSYCLONE_NEMO_DIR}/insert_loop_parallelism.py -I ${MPI_HOME}/include"
export FCFLAGS="-i4 -r8 -O2 -heap-arrays -fp-model=precise -g -qopenmp"
export NEMOV4=1 # Enables specific NEMOV4 exclusions in the PSyclone transformation script

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nemo_v5_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ jobs:
export PSYCLONE_COMPILER=$MPIF90
export MPIF90=psyclonefc
export PARALLEL_DIRECTIVES="omp_threading"
export PSYCLONE_OPTS="--enable-cache -l output -s ${PSYCLONE_NEMO_DIR}/insert_loop_parallelism.py"
export PSYCLONE_OPTS="--keep-comments --enable-cache -l output -s ${PSYCLONE_NEMO_DIR}/insert_loop_parallelism.py"
export FCFLAGS="-fdefault-real-8 -O2 -mno-fma -fno-tree-vectorize -fcray-pointer -ffree-line-length-none -g -fopenmp"

# Clean up and compile
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
export PSYCLONE_COMPILER=$MPIF90
export MPIF90=psyclonefc
export PARALLEL_DIRECTIVES="omp_offloading+omp_threading"
export PSYCLONE_OPTS="--enable-cache -l output -s ${PSYCLONE_NEMO_DIR}/insert_loop_parallelism.py"
export PSYCLONE_OPTS="--keep-comments --enable-cache -l output -s ${PSYCLONE_NEMO_DIR}/insert_loop_parallelism.py"
# Clean up and compile
rm -rf tests/${TEST_DIR}
./makenemo -r BENCH -m linux_spack_profile -n ${TEST_DIR} -j ${NUM_PARALLEL} -v 1
Expand Down
2 changes: 2 additions & 0 deletions changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
74) PR #3511. Add --keep-comments in some NEMO integration tests.

73) PR #3633 for #2927. Ensures the profiling wrapper libs are
thread safe (to permit them to be called from *within* threaded regions).

Expand Down
Loading