diff options
| -rw-r--r-- | src/clblast.cc | 4 | ||||
| -rw-r--r-- | test/correctness/routines/xgemm.cc | 10 | ||||
| -rw-r--r-- | test/correctness/routines/xsymm.cc | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/src/clblast.cc b/src/clblast.cc index 1d4d0621..bb0091a3 100644 --- a/src/clblast.cc +++ b/src/clblast.cc @@ -170,7 +170,6 @@ template StatusCode Gemm<double>(const Layout, const Transpose, const Transpose, const cl_mem, const size_t, const size_t, const double, cl_mem, const size_t, const size_t, cl_command_queue*, cl_event*); -/* template StatusCode Gemm<float2>(const Layout, const Transpose, const Transpose, const size_t, const size_t, const size_t, const float2, const cl_mem, const size_t, const size_t, @@ -183,7 +182,6 @@ template StatusCode Gemm<double2>(const Layout, const Transpose, const Transpose const cl_mem, const size_t, const size_t, const double2, cl_mem, const size_t, const size_t, cl_command_queue*, cl_event*); -*/ // ================================================================================================= @@ -232,7 +230,6 @@ template StatusCode Symm<double>(const Layout, const Side, const Triangle, const cl_mem, const size_t, const size_t, const double, cl_mem, const size_t, const size_t, cl_command_queue*, cl_event*); -/* template StatusCode Symm<float2>(const Layout, const Side, const Triangle, const size_t, const size_t, const float2, const cl_mem, const size_t, const size_t, @@ -245,7 +242,6 @@ template StatusCode Symm<double2>(const Layout, const Side, const Triangle, const cl_mem, const size_t, const size_t, const double2, cl_mem, const size_t, const size_t, cl_command_queue*, cl_event*); -*/ // ================================================================================================= } // namespace clblast diff --git a/test/correctness/routines/xgemm.cc b/test/correctness/routines/xgemm.cc index 04525cc5..2de17518 100644 --- a/test/correctness/routines/xgemm.cc +++ b/test/correctness/routines/xgemm.cc @@ -73,11 +73,11 @@ void XgemmTest(int argc, char *argv[], const bool silent, const std::string &nam TestABC<T> tester{platform_id, device_id, name, options, clblast_lambda, clblas_lambda}; // Loops over the test-cases from a data-layout point of view - for (auto &layout: {Layout::kRowMajor, Layout::kColMajor}) { + for (auto &layout: tester.kLayouts) { args.layout = layout; - for (auto &a_transpose: {Transpose::kNo, Transpose::kYes}) { + for (auto &a_transpose: tester.kTransposes) { args.a_transpose = a_transpose; - for (auto &b_transpose: {Transpose::kNo, Transpose::kYes}) { + for (auto &b_transpose: tester.kTransposes) { args.b_transpose = b_transpose; const auto case_name = ToString(layout)+" "+ToString(a_transpose)+" "+ToString(b_transpose); @@ -96,8 +96,8 @@ void XgemmTest(int argc, char *argv[], const bool silent, const std::string &nam int main(int argc, char *argv[]) { clblast::XgemmTest<float>(argc, argv, false, "SGEMM"); clblast::XgemmTest<double>(argc, argv, true, "DGEMM"); - //clblast::XgemmTest<float2>(argc, argv, true, "CGEMM"); - //clblast::XgemmTest<double2>(argc, argv, true, "ZGEMM"); + clblast::XgemmTest<clblast::float2>(argc, argv, true, "CGEMM"); + clblast::XgemmTest<clblast::double2>(argc, argv, true, "ZGEMM"); return 0; } diff --git a/test/correctness/routines/xsymm.cc b/test/correctness/routines/xsymm.cc index 9bcad253..14d6a3f7 100644 --- a/test/correctness/routines/xsymm.cc +++ b/test/correctness/routines/xsymm.cc @@ -73,7 +73,7 @@ void XsymmTest(int argc, char *argv[], const bool silent, const std::string &nam TestABC<T> tester{platform_id, device_id, name, options, clblast_lambda, clblas_lambda}; // Loops over the test-cases from a data-layout point of view - for (auto &layout: {Layout::kRowMajor, Layout::kColMajor}) { + for (auto &layout: tester.kLayouts) { args.layout = layout; for (auto &side: {Side::kLeft, Side::kRight}) { args.side = side; @@ -96,8 +96,8 @@ void XsymmTest(int argc, char *argv[], const bool silent, const std::string &nam int main(int argc, char *argv[]) { clblast::XsymmTest<float>(argc, argv, false, "SSYMM"); clblast::XsymmTest<double>(argc, argv, true, "DSYMM"); - //clblast::XsymmTest<float2>(argc, argv, true, "CSYMM"); - //clblast::XsymmTest<double2>(argc, argv, true, "ZSYMM"); + clblast::XsymmTest<clblast::float2>(argc, argv, true, "CSYMM"); + clblast::XsymmTest<clblast::double2>(argc, argv, true, "ZSYMM"); return 0; } |