Split run.sh into separate MPI and threads scripts (learning-process#134)

Author: aobolensk

.github/workflows/main.yml

@@ -44,10 +44,13 @@ jobs:
  env:
  CC: gcc-13
  CXX: g++-13
- - name: Run func tests
+ - name: Run func tests (MPI)
+ run: |
+ source scripts/run_mpi.sh
+ - name: Run func tests (threads)
  run: |
  export OMP_NUM_THREADS=4
- source scripts/run.sh
+ source scripts/run_threads.sh
  ubuntu-clang-build:
  runs-on: ubuntu-latest
  steps:
@@ -85,10 +88,13 @@ jobs:
  env:
  CC: clang-18
  CXX: clang++-18
- - name: Run tests
+ - name: Run tests (MPI)
+ run: |
+ source scripts/run_mpi.sh
+ - name: Run tests (threads)
  run: |
  export OMP_NUM_THREADS=4
- source scripts/run.sh
+ source scripts/run_threads.sh
  ubuntu-clang-sanitizer-build:
  runs-on: ubuntu-latest
  steps:
@@ -126,11 +132,15 @@ jobs:
  env:
  CC: clang-18
  CXX: clang++-18
- - name: Run tests
+ - name: Run tests (MPI)
+ run: |
+ export ASAN_RUN=1
+ source scripts/run_mpi.sh
+ - name: Run tests (threads)
  run: |
  export OMP_NUM_THREADS=4
  export ASAN_RUN=1
- source scripts/run.sh
+ source scripts/run_threads.sh
  macos-clang-build:
  runs-on: macOS-latest
  steps:
@@ -160,10 +170,13 @@ jobs:
  - name: Ninja build
  run: |
  cmake --build build
- - name: Run tests
+ - name: Run tests (MPI)
+ run: |
+ source scripts/run_mpi.sh
+ - name: Run tests (threads)
  run: |
  export OMP_NUM_THREADS=4
- source scripts/run.sh
+ source scripts/run_threads.sh
  windows-msvc-build:
  runs-on: windows-latest
  defaults:
@@ -261,10 +274,13 @@ jobs:
  - name: Ninja build
  run: |
  cmake --build build --parallel
- - name: Run tests
+ - name: Run tests (MPI)
+ run: |
+ source scripts/run_mpi.sh
+ - name: Run tests (threads)
  run: |
  export OMP_NUM_THREADS=4
- source scripts/run.sh
+ source scripts/run_threads.sh
  - name: Generate gcovr Coverage Data
  run: |
  cd build

scripts/run_mpi.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [[ $OSTYPE == "linux-gnu" && -z "$ASAN_RUN" ]]; then
+ valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/core_func_tests
+ valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/ref_func_tests
+
+# valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/mpi_func_tests
+fi
+
+./build/bin/core_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
+./build/bin/ref_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
+
+if [[ -z "$ASAN_RUN" ]]; then
+ if [[ $OSTYPE == "linux-gnu" ]]; then
+ mpirun --oversubscribe -np 4 ./build/bin/sample_mpi
+ mpirun --oversubscribe -np 4 ./build/bin/sample_mpi_boost
+ mpirun --oversubscribe -np 4 ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
+ elif [[ $OSTYPE == "darwin"* ]]; then
+ mpirun -np 2 ./build/bin/sample_mpi
+ mpirun -np 2 ./build/bin/sample_mpi_boost
+ mpirun -np 2 ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
+ fi
+fi

scripts/run.sh renamed to scripts/run_threads.sh

@@ -4,7 +4,6 @@ if [[ $OSTYPE == "linux-gnu" && -z "$ASAN_RUN" ]]; then
  valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/core_func_tests
  valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/ref_func_tests
 
-# valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/mpi_func_tests
 # valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/omp_func_tests
  valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/seq_func_tests
  valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/stl_func_tests
@@ -14,37 +13,10 @@ fi
 ./build/bin/core_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
 ./build/bin/ref_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
 
-if [[ -z "$ASAN_RUN" ]]; then
- if [[ $OSTYPE == "linux-gnu" ]]; then
- mpirun --oversubscribe -np 4 ./build/bin/sample_mpi
- mpirun --oversubscribe -np 4 ./build/bin/sample_mpi_boost
- elif [[ $OSTYPE == "darwin"* ]]; then
- mpirun -np 2 ./build/bin/sample_mpi
- mpirun -np 2 ./build/bin/sample_mpi_boost
- fi
-fi
 ./build/bin/sample_omp
 ./build/bin/sample_stl
 ./build/bin/sample_tbb
 
-#if [[ $OSTYPE == "linux-gnu" ]]; then
-# NUM_PROC=$(cat /proc/cpuinfo|grep processor|wc -l)
-#elif [[ $OSTYPE == "darwin"* ]]; then
-# NUM_PROC=$(sysctl -a | grep machdep.cpu | grep thread_count | cut -d ' ' -f 2)
-#else
-# echo "Unknown OS"
-# NUM_PROC="1"
-#fi
-#echo "NUM_PROC: " $NUM_PROC
-
-if [[ -z "$ASAN_RUN" ]]; then
- if [[ $OSTYPE == "linux-gnu" ]]; then
- mpirun --oversubscribe -np 4 ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
- elif [[ $OSTYPE == "darwin"* ]]; then
- mpirun -np 2 ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
- fi
-fi
-
 ./build/bin/omp_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
 ./build/bin/seq_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
 ./build/bin/stl_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating