Skip to content

Commit f02832a

Browse files
committed
updates CI test and scripts
1 parent 55568d8 commit f02832a

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

.github/workflows/perlmutter-no-cache.yaml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ env:
1111
GOOGLE_SPREADSHEET_ID: "${{ secrets.GOOGLE_SPREADSHEET_ID }}"
1212
PDC_TMPDIR: "${{ github.workspace }}/${{ github.run_id }}/pdc-tmp-paralell-pdc"
1313
PDC_DATA_LOC: "${{ github.workspace }}/${{ github.run_id }}/pdc-data-paralell-pdc"
14-
SCHEDULER_PARAMETERS: "-A ${{ secrets.NERSC_PERLMUTTER_PROJECT }} --qos=debug --constraint=cpu --tasks-per-node=64 -N 1 -t 00:30:00"
14+
SCHEDULER_PARAMETERS: "-A ${{ secrets.NERSC_PERLMUTTER_PROJECT }} --qos=debug --constraint=cpu -N 1 -t 00:30:00 -W"
1515
MERCURY_DIR: "/global/cfs/cdirs/${{ secrets.NERSC_PERLMUTTER_PROJECT }}/pdc-perlmutter/mercury/install"
16-
16+
foundation
1717
jobs:
1818
build:
1919
runs-on:
@@ -24,14 +24,22 @@ jobs:
2424
steps:
2525
- uses: actions/[email protected]
2626
- run: |
27-
module load libfabric
2827
module list
2928
3029
mkdir -p build install
3130
3231
cd build
33-
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"
34-
32+
cmake .. \
33+
-DCMAKE_C_COMPILER=cc \
34+
-DCMAKE_INSTALL_PREFIX=$(realpath ..)/install \
35+
-DBUILD_MPI_TESTING=ON \
36+
-DBUILD_SHARED_LIBS=ON \
37+
-DPDC_SERVER_CACHE=OFF \
38+
-DBUILD_TESTING=ON \
39+
-DPDC_ENABLE_MPI=ON \
40+
-DMERCURY_DIR=$MERCURY_DIR \
41+
-DMPI_RUN_CMD="srun -A ${{ secrets.NERSC_PERLMUTTER_PROJECT }} --qos=debug --constraint=cpu"
42+
3543
make -j
3644
make install
3745
- uses: actions/[email protected]
@@ -42,7 +50,7 @@ jobs:
4250
${{ github.workspace }}/build
4351
${{ github.workspace }}/install
4452
45-
parallel-pdc:
53+
test:
4654
needs:
4755
- build
4856
runs-on:
@@ -57,8 +65,11 @@ jobs:
5765
#!/bin/sh
5866
5967
export LD_LIBRARY_PATH="$MERCURY_DIR/lib:$LD_LIBRARY_PATH"
68+
6069
cd ${{ github.workspace }}/no-cache/build
61-
ctest -L parallel_pdc
70+
71+
ctest
72+
6273
rm -rf ${PDC_TMPDIR} ${PDC_DATA_LOC}
6374
6475
EOF

src/tests/run_checkpoint_restart_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Cori CI needs srun even for serial tests
77
run_cmd=""
88

9-
if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
9+
if [[ "$NERSC_HOST" == "perlmutter" ]]; then
1010
run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
1111
fi
1212

src/tests/run_multiple_mpi_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
extra_cmd=""
77

8-
if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
8+
if [[ "$NERSC_HOST" == "perlmutter" ]]; then
99
extra_cmd="--mem=25600 --cpu_bind=cores --overlap"
1010
fi
1111

src/tests/run_multiple_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# Cori CI needs srun even for serial tests
77
run_cmd=""
8-
if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
8+
if [[ "$NERSC_HOST" == "perlmutter" ]]; then
99
run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
1010
fi
1111

src/tests/run_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# Cori CI needs srun even for serial tests
77
run_cmd=""
8-
if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
8+
if [[ "$NERSC_HOST" == "perlmutter" ]]; then
99
run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
1010
fi
1111

0 commit comments

Comments
 (0)