Skip to content

Commit cb30c84

Browse files
committed
add run threads
1 parent 5723e14 commit cb30c84

File tree

3 files changed

+15
-57
lines changed

3 files changed

+15
-57
lines changed

scripts/run_mpi.sh

-24
This file was deleted.

scripts/run_tests.py

+15-7
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,27 @@ def get_common_gtest_settings(repeats_count):
7373
return command
7474

7575

76-
def run_threads():
77-
print(123)
76+
def run_threads(install_bin_dir):
77+
valgrind_running = "valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all"
78+
if platform.system() == "Linux" and not os.environ.get("ASAN_RUN"):
79+
run_exec_file(f"{valgrind_running} {Path(install_bin_dir) / 'seq_func_tests'} {get_common_gtest_settings(1)}")
80+
run_exec_file(f"{valgrind_running} {Path(install_bin_dir) / 'stl_func_tests'} {get_common_gtest_settings(1)}")
81+
82+
run_exec_file(f"{Path(install_bin_dir) / 'omp_func_tests'} {get_common_gtest_settings(3)}")
83+
run_exec_file(f"{Path(install_bin_dir) / 'seq_func_tests'} {get_common_gtest_settings(3)}")
84+
run_exec_file(f"{Path(install_bin_dir) / 'stl_func_tests'} {get_common_gtest_settings(3)}")
85+
run_exec_file(f"{Path(install_bin_dir) / 'tbb_func_tests'} {get_common_gtest_settings(3)}")
7886

7987

80-
def run_common(install_bin_dir):
88+
def run_core(install_bin_dir):
8189
valgrind_running = "valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all"
8290

8391
if platform.system() == "Linux" and not os.environ.get("ASAN_RUN"):
8492
run_exec_file(f"{valgrind_running} {Path(install_bin_dir) / 'core_func_tests'} {get_common_gtest_settings(1)}")
8593
run_exec_file(f"{valgrind_running} {Path(install_bin_dir) / 'ref_func_tests'} {get_common_gtest_settings(1)}")
8694

87-
run_exec_file(f"{Path(install_bin_dir) / 'core_func_tests'} {get_common_gtest_settings(10)}")
88-
run_exec_file(f"{Path(install_bin_dir) / 'ref_func_tests'} {get_common_gtest_settings(10)}")
95+
run_exec_file(f"{Path(install_bin_dir) / 'core_func_tests'} {get_common_gtest_settings(3)}")
96+
run_exec_file(f"{Path(install_bin_dir) / 'ref_func_tests'} {get_common_gtest_settings(3)}")
8997

9098

9199
def run_processes(install_bin_dir, additional_mpi_args):
@@ -102,9 +110,9 @@ def run_processes(install_bin_dir, additional_mpi_args):
102110
if __name__ == "__main__":
103111
args_dict = init_cmd_args()
104112
executable_path = setup_env()
105-
run_common(executable_path)
113+
run_core(executable_path)
106114
if args_dict["running_type"] == "threads":
107-
run_threads()
115+
run_threads(executable_path)
108116
elif args_dict["running_type"] == "processes":
109117
run_processes(executable_path, args_dict["additional_mpi_args"])
110118
else:

scripts/run_threads.sh

-26
This file was deleted.

0 commit comments

Comments
 (0)