@@ -21,6 +21,7 @@ using TestType = int;
2121
2222class NesterovARunFuncTests : public ppc ::util::BaseRunFuncTests<InType, OutType, TestType> {
2323 InType input_data_;
24+
2425 public:
2526 static std::string CustomFuncTestName (
2627 const ::testing::TestParamInfo<ppc::util::FuncTestParam<InType, OutType, TestType>> &info) {
@@ -43,7 +44,7 @@ class NesterovARunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType
4344 }
4445 auto img = std::vector<uint8_t >(data, data + (static_cast <ptrdiff_t >(width * height * channels)));
4546 stbi_image_free (data);
46- if (width != height) {
47+ if (width != height) {
4748 throw std::runtime_error (" width != height: " );
4849 }
4950 }
@@ -55,22 +56,21 @@ class NesterovARunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType
5556 }
5657 }
5758
58- bool CheckTestOutputData (OutType& output_data) final { return input_data_ == output_data; }
59+ bool CheckTestOutputData (OutType & output_data) final { return input_data_ == output_data; }
5960
6061 InType GetTestInputData () final { return input_data_; }
6162};
6263
6364TEST_P (NesterovARunFuncTests, MatmulFromPic) { ExecuteTest (GetParam ()); }
6465
65- #define ADD_FUNC_TASK (TASK ) \
66- std::make_tuple (ppc::core::TaskGetter<TASK , InType>, ppc::util::GetNamespace<TASK >(), 5), \
67- std::make_tuple(ppc::core::TaskGetter<TASK , InType>, ppc::util::GetNamespace<TASK >(), 10)
66+ constexpr std::array<TestType, 3 > kTestParam = {5 , 10 , 15 };
67+
68+ DEFINE_GEN_TASK_TUPLES (InType, kTestParam )
69+
70+ static auto tasks_list = std::tuple_cat(
71+ GenTaskTuples<nesterov_a_test_task_all::TestTaskALL>(), GenTaskTuples<nesterov_a_test_task_mpi::TestTaskMPI>(),
72+ GenTaskTuples<nesterov_a_test_task_omp::TestTaskOMP>(), GenTaskTuples<nesterov_a_test_task_seq::TestTaskSEQ>(),
73+ GenTaskTuples<nesterov_a_test_task_stl::TestTaskSTL>(), GenTaskTuples<nesterov_a_test_task_tbb::TestTaskTBB>());
6874
69- INSTANTIATE_TEST_SUITE_P_NOLINT(PicMatrixTests, NesterovARunFuncTests,
70- ::testing::Values (ADD_FUNC_TASK (nesterov_a_test_task_all::TestTaskALL),
71- ADD_FUNC_TASK(nesterov_a_test_task_mpi::TestTaskMPI),
72- ADD_FUNC_TASK(nesterov_a_test_task_omp::TestTaskOMP),
73- ADD_FUNC_TASK(nesterov_a_test_task_seq::TestTaskSEQ),
74- ADD_FUNC_TASK(nesterov_a_test_task_stl::TestTaskSTL),
75- ADD_FUNC_TASK(nesterov_a_test_task_tbb::TestTaskTBB)),
75+ INSTANTIATE_TEST_SUITE_P_NOLINT (PicMatrixTests, NesterovARunFuncTests, ppc::util::ExpandToValues(tasks_list),
7676 NesterovARunFuncTests::CustomFuncTestName);
0 commit comments