Skip to content

Commit d4ed8d3

Browse files
committed
Refactor test and script logic for improved readability
Standardized line formatting in test definitions and Python scripts. Adjustments enhance code readability without altering functionality or behavior.
1 parent a8fdefd commit d4ed8d3

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

scripts/run_tests.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,16 @@ def __get_gtest_settings(repeats_count, type_task):
6464
def run_threads(self):
6565
if platform.system() == "Linux" and not os.environ.get("ASAN_RUN"):
6666
for task_type in ["seq", "stl"]:
67-
self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'ppc_func_tests'} {self.__get_gtest_settings(1, '_' + task_type + '_')}")
67+
self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'ppc_func_tests'} "
68+
f"{self.__get_gtest_settings(1, '_' + task_type + '_')}")
6869

6970
for task_type in ["omp", "seq", "stl", "tbb"]:
7071
self.__run_exec(f"{self.work_dir / 'ppc_func_tests'} {self.__get_gtest_settings(3, '_' + task_type + '_')}")
7172

7273
def run_core(self):
7374
if platform.system() == "Linux" and not os.environ.get("ASAN_RUN"):
74-
self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'core_func_tests'} {self.__get_gtest_settings(1, '*')}")
75+
self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'core_func_tests'} "
76+
f"{self.__get_gtest_settings(1, '*')}")
7577

7678
self.__run_exec(f"{self.work_dir / 'core_func_tests'} {self.__get_gtest_settings(1, '*')}")
7779

@@ -83,7 +85,8 @@ def run_processes(self, additional_mpi_args):
8385
mpi_running = f"{self.mpi_exec} {additional_mpi_args} -np {proc_count}"
8486
if not os.environ.get("ASAN_RUN"):
8587
for task_type in ["all", "mpi"]:
86-
self.__run_exec(f"{mpi_running} {self.work_dir / 'ppc_func_tests'} {self.__get_gtest_settings(10, '_' + task_type)}")
88+
self.__run_exec(f"{mpi_running} {self.work_dir / 'ppc_func_tests'} "
89+
f"{self.__get_gtest_settings(10, '_' + task_type)}")
8790

8891
def run_performance(self):
8992
if not os.environ.get("ASAN_RUN"):
@@ -92,13 +95,14 @@ def run_performance(self):
9295
raise EnvironmentError("Required environment variable 'PROC_COUNT' is not set.")
9396
mpi_running = f"{self.mpi_exec} -np {proc_count}"
9497
for task_type in ["all", "mpi"]:
95-
self.__run_exec(f"{mpi_running} {self.work_dir / 'ppc_perf_tests'} {self.__get_gtest_settings(1, '_' + task_type)}")
98+
self.__run_exec(f"{mpi_running} {self.work_dir / 'ppc_perf_tests'} "
99+
f"{self.__get_gtest_settings(1, '_' + task_type)}")
96100

97101
for task_type in ["omp", "seq", "stl", "tbb"]:
98102
self.__run_exec(f"{self.work_dir / 'ppc_perf_tests'} {self.__get_gtest_settings(1, '_' + task_type)}")
99103

100104
def run_performance_list(self):
101-
self.__run_exec(f"{self.work_dir / 'ppc_perf_tests'} --gtest_list_tests")
105+
self.__run_exec(f"{self.work_dir / 'ppc_perf_tests'} --gtest_list_tests")
102106

103107

104108
if __name__ == "__main__":

tasks/example/tests/func_tests/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class NesterovARunFuncTests : public ::testing::TestWithParam<ppc::util::FuncTes
2323
static std::string CustomFuncTestName(
2424
const ::testing::TestParamInfo<ppc::util::FuncTestParam<InType, OutType, int>>& info) {
2525
return std::get<ppc::util::FuncTestParamIndex::kNameTest>(info.param) + "_" +
26-
std::to_string(std::get<ppc::util::FuncTestParamIndex::kAddParams>(info.param));
26+
std::to_string(std::get<ppc::util::FuncTestParamIndex::kAddParams>(info.param));
2727
}
2828

2929
protected:
@@ -60,7 +60,7 @@ class NesterovARunFuncTests : public ::testing::TestWithParam<ppc::util::FuncTes
6060

6161
TEST_P(NesterovARunFuncTests, MatmulFromPic) { ExecuteTest(); }
6262

63-
#define ADD_FUNC_TASK(TASK) \
63+
#define ADD_FUNC_TASK(TASK) \
6464
std::make_tuple(ppc::core::TaskGetter<TASK, InType>, ppc::util::GetNamespace<TASK>(), 5), \
6565
std::make_tuple(ppc::core::TaskGetter<TASK, InType>, ppc::util::GetNamespace<TASK>(), 10)
6666

0 commit comments

Comments
 (0)