Skip to content

Commit 6d67295

Browse files
committed
fix scripts
1 parent 297e5a5 commit 6d67295

6 files changed

+9
-1
lines changed

Diff for: scripts/create_perf_table.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
logs_path = os.path.abspath(args.input)
1212
xlsx_path = os.path.abspath(args.output)
1313

14-
list_of_type_of_tasks = ["mpi", "omp", "seq", "stl", "tbb"]
14+
list_of_type_of_tasks = ["all", "mpi", "omp", "seq", "stl", "tbb"]
1515

1616
result_tables = {"pipeline": {}, "task_run": {}}
1717
set_of_task_name = []

Diff for: scripts/run.bat

+2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ if "%CLANG_BUILD%" NEQ "1" build\bin\sample_omp.exe
99
build\bin\sample_stl.exe
1010
build\bin\sample_tbb.exe
1111

12+
if "%CLANG_BUILD%" NEQ "1" mpiexec.exe -np 4 build\bin\all_func_tests.exe --gtest_repeat=10 || exit 1
1213
if "%CLANG_BUILD%" NEQ "1" mpiexec.exe -np 4 build\bin\mpi_func_tests.exe --gtest_repeat=10 || exit 1
14+
if "%CLANG_BUILD%" NEQ "1" build\bin\all_func_tests.exe || exit 1
1315
if "%CLANG_BUILD%" NEQ "1" build\bin\mpi_func_tests.exe || exit 1
1416
if "%CLANG_BUILD%" NEQ "1" build\bin\omp_func_tests.exe --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating || exit 1
1517
build\bin\seq_func_tests.exe --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating || exit 1

Diff for: scripts/run_mpi.sh

+2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ if [[ -z "$ASAN_RUN" ]]; then
1414
if [[ $OSTYPE == "linux-gnu" ]]; then
1515
mpirun --oversubscribe -np $PROC_COUNT ./build/bin/sample_mpi
1616
mpirun --oversubscribe -np $PROC_COUNT ./build/bin/sample_mpi_boost
17+
mpirun --oversubscribe -np $PROC_COUNT ./build/bin/all_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
1718
mpirun --oversubscribe -np $PROC_COUNT ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
1819
elif [[ $OSTYPE == "darwin"* ]]; then
1920
mpirun -np $PROC_COUNT ./build/bin/sample_mpi
2021
mpirun -np $PROC_COUNT ./build/bin/sample_mpi_boost
22+
mpirun -np $PROC_COUNT ./build/bin/all_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
2123
mpirun -np $PROC_COUNT ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
2224
fi
2325
fi

Diff for: scripts/run_perf_collector.bat

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
REM mpiexec -np 4 build\bin\mpi_perf_tests.exe
2+
REM mpiexec -np 4 build\bin\all_perf_tests.exe
23
build\bin\omp_perf_tests.exe
34
build\bin\seq_perf_tests.exe
45
build\bin\stl_perf_tests.exe

Diff for: scripts/run_perf_collector.sh

+2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
if [[ -z "$ASAN_RUN" ]]; then
44
if [[ $OSTYPE == "linux-gnu" ]]; then
5+
mpirun --oversubscribe -np 4 ./build/bin/all_perf_tests
56
mpirun --oversubscribe -np 4 ./build/bin/mpi_perf_tests
67
elif [[ $OSTYPE == "darwin"* ]]; then
8+
mpirun -np 2 ./build/bin/all_perf_tests
79
mpirun -np 2 ./build/bin/mpi_perf_tests
810
fi
911
fi

Diff for: scripts/run_perf_count_checker.sh

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ run_check() {
4040
fi
4141
}
4242

43+
run_check "all"
4344
run_check "mpi"
4445
run_check "omp"
4546
run_check "seq"

0 commit comments

Comments
 (0)