mfc.sh test: Add -% to speed up debug CI

Author: henryleberre

.github/workflows/ci.yml

@@ -25,24 +25,26 @@ jobs:
         mpi:   ['mpi', 'no-mpi']
         debug: ['debug', 'no-debug']
         intel: [true, false]
+        exclude:
+          - intel: true
+            os:    macos
       fail-fast: false
     continue-on-error: true
     runs-on: ${{ matrix.os }}-latest
     steps:
       - name: Clone
-        if: matrix.os == 'ubuntu' || (matrix.os == 'macos' && matrix.intel == false)
         uses: actions/checkout@v3
 
       - name: Setup MacOS
-        if:   matrix.os == 'macos' && matrix.intel == false
+        if:   matrix.os == 'macos'
         run: |
           echo "CC=gcc-13"      >> $GITHUB_ENV
           echo "CXX=g++-13"     >> $GITHUB_ENV
           echo "FC=gfortran-13" >> $GITHUB_ENV
           brew install wget make python make cmake coreutils gcc@13
           
       - name: (MacOS) Build OpenMPI
-        if:   matrix.os == 'macos' && matrix.mpi == 'mpi' && matrix.intel == false
+        if:   matrix.os == 'macos' && matrix.mpi == 'mpi'
         run: |
           echo "OMPI_FC=gfortran-13" >> $GITHUB_ENV
           echo "OMPI_CXX=g++-13"     >> $GITHUB_ENV
@@ -75,27 +77,18 @@ jobs:
           echo "MPI_HOME=/opt/intel/oneapi/mpi/2021.7.1/"    >> $GITHUB_ENV
           echo "I_MPI_ROOT=/opt/intel/oneapi/mpi/2021.7.1/"    >> $GITHUB_ENV
 
-      - name: Build-intel
-        if:   matrix.intel == true && matrix.os == 'ubuntu'
-        run:  |
-          source /opt/intel/oneapi/setvars.sh
-          /bin/bash mfc.sh build -j $(nproc) --${{ matrix.debug }} --${{ matrix.mpi }} 
-
       - name: Build
-        if:   matrix.intel == false
         run:  |
+          if [ '${{ matrix.intel }}' == 'true' ]; then source /opt/intel/oneapi/setvars.sh; fi
           /bin/bash mfc.sh build -j $(nproc) --${{ matrix.debug }} --${{ matrix.mpi }} 
 
-      - name: Test-intel
-        if:   matrix.intel == true && matrix.os == 'ubuntu'
-        run:  |
-          source /opt/intel/oneapi/setvars.sh
-          /bin/bash mfc.sh test -j $(nproc) $(if [ "${{ matrix.mpi }}" == "mpi" ]; then echo "--test-all"; fi)
-
       - name: Test
-        if:   matrix.intel == false
         run:  |
-          /bin/bash mfc.sh test -j $(nproc) $(if [ "${{ matrix.mpi }}" == "mpi" ]; then echo "--test-all"; fi)
+          if [ '${{ matrix.intel }}' == 'true' ]; then source /opt/intel/oneapi/setvars.sh; fi
+          /bin/bash mfc.sh test -j $(nproc) $OPT1 $OPT2
+        env:
+          OPT1: ${{ matrix.mpi == 'mpi' && '--test-all' || '' }}
+          OPT2: ${{ matrix.debug == 'debug' && '-% 75' || '' }}
 
   docker:
     name:    Github | Docker

misc/run-phoenix-release-cpu.sh

@@ -12,5 +12,5 @@ cd "$SLURM_SUBMIT_DIR"
 echo "Running in $(pwd):"
 
 . ./mfc.sh load -c p -m gpu
-./mfc.sh test -j 12 -b mpirun -a
+./mfc.sh test -j $(nproc) -b mpirun -a
 

misc/run-phoenix-release-gpu.sh

@@ -16,6 +16,9 @@ set -x
 
 . ./mfc.sh load -c p -m GPU
 
+gpu_count=$(nvidia-smi -L | wc -l)        # number of GPUs on node
+gpu_ids=$(seq -s ',' 0 $(($gpu_count-1))) # 0,1,2,...,gpu_count-1
+
 ./mfc.sh test -a -b mpirun -j $(nproc) \
-              --gpu -g $(seq -s ',' 0 $(($(nvidia-smi -L | wc -l)-1)))
+              --gpu -g $gpu_ids
 

toolchain/mfc/args.py

@@ -82,6 +82,7 @@ def add_common_arguments(p, mask = None):
     test.add_argument("-r", "--relentless",  action="store_true", default=False, help="Run all tests, even if multiple fail.")
     test.add_argument("-a", "--test-all",    action="store_true", default=False, help="Run the Post Process Tests too.")
     test.add_argument("-g", "--gpus",        type=str, default="0", help="(GPU) Comma separated list of GPU #s to use.")
+    test.add_argument("-%", "--percent",     type=int, default=100, help="Percentage of tests to run.")
 
     test.add_argument("--case-optimization", action="store_true", default=False, help="(GPU Optimization) Compile MFC targets with some case parameters hard-coded.")
 

toolchain/mfc/test/test.py

@@ -1,5 +1,6 @@
 import os, math, shutil
 
+from random    import sample
 from ..printer import cons
 from ..        import common
 from ..state   import ARG
@@ -55,6 +56,11 @@ def __filter():
             if case.ppn > 1:
                 CASES.remove(case)
 
+    if ARG("percent") == 100:
+        return
+
+    CASES = sample(CASES, k=int(len(CASES)*ARG("percent")/100.0))
+
 
 def test():
     global CASES, nFAIL