Playing with benchmarks script

UoB-HPC · Oct 25, 2024 · c27b21b · c27b21b
1 parent fdd0c7a
commit c27b21b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/.github/actions/simeng_benchmarks/action.yml b/.github/actions/simeng_benchmarks/action.yml
@@ -20,22 +20,12 @@ runs:
       run: |
         cd ${{ inputs.RUN_DIR }}
         simeng $GITHUB_WORKSPACE/configs/a64fx.yaml ${{ inputs.BIN_PATH }} 2>&1 tee $GITHUB_WORKSPACE/simeng.tmp
-        python -c "
-            import os
-
-            file_path = $GITHUB_WORKSPACE/simeng.tmp
-
-            if not os.path.exists(file_path):
-              print(f'File not found: {file_path}')
-              exit(1)
-
-            with open(file_path, 'r') as f:
-              if ${{ inputs.PASS_STRING }} in f.read():
-                print('Passed')
-              else:
-                print('Failed')
-                exit(1)
-          "
+        if contains(${{ inputs.PASS_STRING }}, $GITHUB_WORKSPACE/simeng.tmp); then
+          echo "Passed"
+        else 
+          echo "Failed"
+          exit(1)
+        fi
 #
 #    "name": "CloverLeaf serial gcc8.3.0 armv8.4",
 #    "run_from": "$SIMENG_BENCHMARKS_SRC_DIR/Data_Files/CloverLeaf",

diff --git a/.github/workflows/LINUX_BUILD_TEST.yml b/.github/workflows/LINUX_BUILD_TEST.yml
@@ -26,8 +26,8 @@ jobs:
       fail-fast: false
       matrix:
 
-        COMPILER: ['gcc-7']# , 'gcc-8', 'gcc-9', 'gcc-10'] # armclang ] compiler names
-        OS: ['ubuntu:18.04']#,'ubuntu:20.04', 'rockylinux:8', 'redhat/ubi8:latest', 'redhat/ubi9:latest', 'debian:10', 'debian:11'] # Docker images
+        COMPILER: ['gcc-7' , 'gcc-8', 'gcc-9', 'gcc-10'] # armclang ] compiler names
+        OS: ['ubuntu:18.04','ubuntu:20.04', 'rockylinux:8', 'redhat/ubi8:latest', 'redhat/ubi9:latest', 'debian:10', 'debian:11'] # Docker images
 
         #######################################
         # Removes unecessary jobs as jobs are generated in the order seen in the matrix.

diff --git a/.github/workflows/MAIN.yml b/.github/workflows/MAIN.yml
@@ -40,11 +40,11 @@ jobs:
       SIMENG-MODE: Release
     secrets: inherit
 
-#  RELEASE_MACOS:
-#    name: "Release - build, test and benchmarks"
-#    uses: ./.github/workflows/MACOS_BUILD_TEST.yml
-#    with:
-#      SIMENG-MODE: Release
-#    secrets: inherit
+  RELEASE_MACOS:
+    name: "Release - build, test and benchmarks"
+    uses: ./.github/workflows/MACOS_BUILD_TEST.yml
+    with:
+      SIMENG-MODE: Release
+    secrets: inherit