updates CI test and scripts

hpc-io · Dec 11, 2024 · f02832a · f02832a
1 parent 55568d8
commit f02832a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/perlmutter-no-cache.yaml b/.github/workflows/perlmutter-no-cache.yaml
@@ -11,9 +11,9 @@ env:
   GOOGLE_SPREADSHEET_ID: "${{ secrets.GOOGLE_SPREADSHEET_ID }}"
   PDC_TMPDIR: "${{ github.workspace }}/${{ github.run_id }}/pdc-tmp-paralell-pdc"
   PDC_DATA_LOC: "${{ github.workspace }}/${{ github.run_id }}/pdc-data-paralell-pdc"
-  SCHEDULER_PARAMETERS: "-A ${{ secrets.NERSC_PERLMUTTER_PROJECT }} --qos=debug --constraint=cpu --tasks-per-node=64 -N 1 -t 00:30:00"
+  SCHEDULER_PARAMETERS: "-A ${{ secrets.NERSC_PERLMUTTER_PROJECT }} --qos=debug --constraint=cpu -N 1 -t 00:30:00 -W"
   MERCURY_DIR: "/global/cfs/cdirs/${{ secrets.NERSC_PERLMUTTER_PROJECT }}/pdc-perlmutter/mercury/install"
-
+foundation
 jobs:
   build:
     runs-on:
@@ -24,14 +24,22 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - run: |
-        module load libfabric
         module list
         
         mkdir -p build install
         
         cd build
-        cmake .. -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DPDC_SERVER_CACHE=OFF -DBUILD_TESTING=ON -DCMAKE_INSTALL_PREFIX=$(realpath ..)/install -DPDC_ENABLE_MPI=ON -DMERCURY_DIR=$MERCURY_DIR -DCMAKE_C_COMPILER=cc -DMPI_RUN_CMD="srun -A ${{ secrets.NERSC_PERLMUTTER_PROJECT }} --qos=debug --constraint=cpu --tasks-per-node=64"
-        
+        cmake .. \
+          -DCMAKE_C_COMPILER=cc \
+          -DCMAKE_INSTALL_PREFIX=$(realpath ..)/install \
+          -DBUILD_MPI_TESTING=ON \
+          -DBUILD_SHARED_LIBS=ON \
+          -DPDC_SERVER_CACHE=OFF \
+          -DBUILD_TESTING=ON \
+          -DPDC_ENABLE_MPI=ON \
+          -DMERCURY_DIR=$MERCURY_DIR \
+          -DMPI_RUN_CMD="srun -A ${{ secrets.NERSC_PERLMUTTER_PROJECT }} --qos=debug --constraint=cpu"
+
         make -j
         make install
     - uses: actions/upload-artifact@v4.1.0
@@ -42,7 +50,7 @@ jobs:
           ${{ github.workspace }}/build
           ${{ github.workspace }}/install
 
-  parallel-pdc:
+  test:
     needs:
     - build
     runs-on:
@@ -57,8 +65,11 @@ jobs:
         #!/bin/sh
 
         export LD_LIBRARY_PATH="$MERCURY_DIR/lib:$LD_LIBRARY_PATH"
+        
         cd ${{ github.workspace }}/no-cache/build
-        ctest -L parallel_pdc
+        
+        ctest
+
         rm -rf ${PDC_TMPDIR} ${PDC_DATA_LOC}
 
         EOF

diff --git a/src/tests/run_checkpoint_restart_test.sh b/src/tests/run_checkpoint_restart_test.sh
@@ -6,7 +6,7 @@
 # Cori CI needs srun even for serial tests
 run_cmd=""
 
-if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
     run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi
 

diff --git a/src/tests/run_multiple_mpi_test.sh b/src/tests/run_multiple_mpi_test.sh
@@ -5,7 +5,7 @@
 
 extra_cmd=""
 
-if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
     extra_cmd="--mem=25600 --cpu_bind=cores --overlap"
 fi
 

diff --git a/src/tests/run_multiple_test.sh b/src/tests/run_multiple_test.sh
@@ -5,7 +5,7 @@
 
 # Cori CI needs srun even for serial tests
 run_cmd=""
-if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
     run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi
 

diff --git a/src/tests/run_test.sh b/src/tests/run_test.sh
@@ -5,7 +5,7 @@
 
 # Cori CI needs srun even for serial tests
 run_cmd=""
-if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
     run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi