Revert full numerical checks for some lfric targets

Author: sergisiso

.github/workflows/lfric_test.yml

@@ -42,7 +42,7 @@ on:
   push
 
 env:
-  LFRIC_APPS_HASH: bea4e73b4fafebb6406aa91cc3aceb39b050f68c
+  LFRIC_APPS_HASH: 7c8582ccbbffedf315da5784cb27c1b38ceec29e
   PYTHON_VERSION: "3.14"
   GNU_TOOLCHAIN: gnu14_openmpi
   NVHPC_TOOLCHAIN: nvhpc26_3_openmpi
@@ -127,7 +127,7 @@ jobs:
         export OMP_NUM_THREADS=1
         export START_TIME=$SECONDS
         mpirun -n 12 ../bin/gungho_model configuration.nml
-        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-12r-1t.txt gungho_model-checksums.txt || true
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-12r-1t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
 
@@ -150,7 +150,7 @@ jobs:
         # Clean previous version and compile again
         rm -rf working-gh-ompoffload
         export BUILD_START="${SECONDS}"
-        LFRIC_OFFLOAD_DIRECTIVES=omp ./build/local_build.py -j ${NUM_PARALLEL} -p psyclone-test \
+        LFRIC_OFFLOAD_DIRECTIVES=omp_uniform ./build/local_build.py -j ${NUM_PARALLEL} -p psyclone-test \
           -w working-gh-ompoffload gungho_model |& tee output.txt
         # Piping to tee ignores the errcode of the first command, make sure we account for it
         if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
@@ -164,7 +164,8 @@ jobs:
         export CUDA_VISIBLE_DEVICES=1
         export START_TIME=$SECONDS
         mpirun -n 1 ../bin/gungho_model configuration.nml
-        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-nvhpc-1r-12t.txt gungho_model-checksums.txt || true
+        # TODO #3207: Results not fully_reproducible with CPU
+        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-nvhpc-1r-12t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
         echo "build_time=${BUILD_ELAPSED}" >> "${GITHUB_OUTPUT}"
@@ -187,15 +188,16 @@ jobs:
         cp ${PSYCLONE_LFRIC_DIR}/gpu_offloading.py ${OPT_DIR}/global.py
         # Clean previous version and compile again
         rm -rf working-gh-accoffload
-        LFRIC_OFFLOAD_DIRECTIVES=acc ./build/local_build.py -j ${NUM_PARALLEL} -p psyclone-test \
+        LFRIC_OFFLOAD_DIRECTIVES=acc_uniform ./build/local_build.py -j ${NUM_PARALLEL} -p psyclone-test \
           -w working-gh-accoffload gungho_model
         cd applications/gungho_model/example
         rm -f timer.txt gungho_model-checksums.txt  # In case there were from a previous run
         export OMP_NUM_THREADS=12
         export CUDA_VISIBLE_DEVICES=1
         export START_TIME=$SECONDS
         mpirun -n 1 ../bin/gungho_model configuration.nml
-        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-nvhpc-1r-12t.txt gungho_model-checksums.txt || true
+        # TODO #3207: Results not fully_reproducible with CPU
+        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-nvhpc-1r-12t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
 
@@ -224,7 +226,7 @@ jobs:
         export OMP_NUM_THREADS=4
         export START_TIME=$SECONDS
         mpirun -n 6 ../bin/gungho_model configuration.nml
-        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-6r-4t.txt gungho_model-checksums.txt || true
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-6r-4t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
 
@@ -253,7 +255,8 @@ jobs:
         export OMP_NUM_THREADS=4
         export START_TIME=$SECONDS
         mpirun -n 6 ../bin/gungho_model configuration.nml
-        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-6r-4t.txt gungho_model-checksums.txt || true
+        # TODO #3207: Results not fully_reproducible (one digit divergence)
+        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-6r-4t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
 
@@ -281,7 +284,7 @@ jobs:
         OMP_NUM_THREADS=8 mpirun -n 1 ../bin/lfric_atm configuration.nml
 
         # And compare the results
-        diff ${PSYCLONE_LFRIC_DIR}/KGOs/lfric_atm-checksums-gnu-1r-8t.txt lfric_atm-checksums.txt || true
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/lfric_atm-checksums-gnu-1r-8t.txt lfric_atm-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
         echo "build_time=${BUILD_ELAPSED}" >> "${GITHUB_OUTPUT}"

examples/lfric/scripts/KGOs/gungho_model-checksums-gnu-12r-1t.txt

@@ -1,3 +1,3 @@
-Inner product checksum rho = 40D0CC8DC064B3E1
-Inner product checksum theta = 41FCE985F2DD2756
-Inner product checksum u = 450134BD797FD66E
+Inner product checksum rho = 40D0CC8DC064EC64
+Inner product checksum theta = 41FCE985F2DCC442
+Inner product checksum u = 450134BD7975D4C1

examples/lfric/scripts/KGOs/gungho_model-checksums-nvhpc-1r-12t.txt

@@ -1,3 +1,3 @@
-Inner product checksum rho = 40D0CC8DC0650BE9
-Inner product checksum theta = 41FCE985F2DD42FF
-Inner product checksum u = 450134BD79897C7B
+Inner product checksum rho = 40D0CC8DC0646402
+Inner product checksum theta = 41FCE985F2DD5BB9
+Inner product checksum u = 450134BD79977C0C

examples/lfric/scripts/KGOs/lfric_psyclone.cfg

@@ -94,8 +94,8 @@ precision_map = i_def: 4,
                 r_um: 8
 
 # Specify whether we generate code to perform runtime correctness checks
-RUN_TIME_CHECKS = false
+RUN_TIME_CHECKS = none
 
 # Number of ANY_SPACE and ANY_DISCONTINUOUS_SPACE function spaces
-NUM_ANY_SPACE = 10
+NUM_ANY_SPACE = 20
 NUM_ANY_DISCONTINUOUS_SPACE = 20

examples/lfric/scripts/Makefile

@@ -36,8 +36,9 @@
 
 include ../../common.mk
 
-# Get all psyclone scripts in this folder, which are all python files
-SCRIPTS = $(wildcard *.py)
+# Get all psyclone scripts in this folder, which are all python files excluding
+# the compare_output.py script
+SCRIPTS = $(filter-out compare_output.py, $(wildcard *.py))
 
 # The kernel-extraction script generates driver source files.
 GENERATED_FILES += driver-*.F90

examples/lfric/scripts/compare_output.py

@@ -0,0 +1,82 @@
+# -----------------------------------------------------------------------------
+# BSD 3-Clause License
+#
+# Copyright (c) 2023-2026, Science and Technology Facilities Council
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# * Neither the name of the copyright holder nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+# Author: S. Siso, STFC Daresbury Lab
+# -----------------------------------------------------------------------------
+
+''' Script to compare LFRic output files. '''
+
+import sys
+import os
+
+TOLERANCE_DIGITS = 8
+
+
+def main():
+    ''' Compare the two provided LFRic output files, it checks that the
+    checksum values are equivalent (within a tolerance). '''
+
+    # Parse input arguments
+    if len(sys.argv) - 1 != 2:
+        sys.exit(f"This script expects exactly 2 arguments with the two files "
+                 f"to compare, but got: {sys.argv}")
+    filename1 = sys.argv[1]
+    filename2 = sys.argv[2]
+    if not os.path.isfile(filename1):
+        sys.exit(f"The first argument '{filename1}' must point to a file.")
+    if not os.path.isfile(filename2):
+        sys.exit(f"The second argument '{filename2}' must point to a file.")
+
+    # Compare filename1 with filename2
+    with open(filename1, 'r', encoding="utf-8") as file1, \
+         open(filename2, 'r', encoding="utf-8") as file2:
+        line_f1 = file1.readline()
+        line_f2 = file2.readline()
+        while line_f1 and line_f2:
+            value1 = line_f1.split('=')[-1][:TOLERANCE_DIGITS]
+            value2 = line_f2.split('=')[-1][:TOLERANCE_DIGITS]
+            if value1 != value2:
+                sys.exit(f"The values are not equal:\n{line_f1}{line_f2}")
+
+            # Get next lines
+            line_f1 = file1.readline()
+            line_f2 = file2.readline()
+
+        if file1.readline() or file2.readline():
+            sys.exit("The files have a different number of lines")
+
+    sys.exit(0)  # Successful comparison
+
+
+if __name__ == "__main__":
+    main()

examples/lfric/scripts/gpu_offloading.py

@@ -113,7 +113,7 @@ def trans(psyir):
     mod_inline_trans = KernelModuleInlineTrans()
     inline_trans = InlineTrans()
 
-    if OFFLOAD_DIRECTIVES == "omp":
+    if OFFLOAD_DIRECTIVES.startswith("omp"):
         # Use OpenMP offloading
         loop_offloading_trans = OMPLoopTrans(
             omp_directive="teamsdistributeparalleldo",
@@ -124,16 +124,16 @@ def trans(psyir):
         kernels_trans = None
         gpu_region_trans = OMPTargetTrans()
         gpu_annotation_trans = OMPDeclareTargetTrans()
-    elif OFFLOAD_DIRECTIVES == "acc":
+    elif OFFLOAD_DIRECTIVES.startswith("acc"):
         # Use OpenACC offloading
         loop_offloading_trans = ACCLoopTrans()
         kernels_trans = ACCKernelsTrans()
         gpu_region_trans = ACCParallelTrans(default_present=False)
         gpu_annotation_trans = ACCRoutineTrans()
     else:
         print(f"The PSyclone transformation script expects the "
-              f"LFRIC_OFFLOAD_DIRECTIVES to be set to 'omp' or 'acc' "
-              f"but found '{OFFLOAD_DIRECTIVES}'.")
+              f"LFRIC_OFFLOAD_DIRECTIVES to be set to 'omp', 'omp_uniform', "
+              f"'acc' or 'acc_uniform' but found '{OFFLOAD_DIRECTIVES}'.")
         sys.exit(-1)
 
     print(f"PSy name = '{psyir.name}'")