From 2568c6b466e700da3412a67f9f06cd1e7275f37e Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Tue, 17 Sep 2019 12:08:46 +0100 Subject: COMPMID-2665: CLGEMMMatrixMultiplyReshaped nightly tests are failing due to cl error -45 Change-Id: Ifaf50afadee7701e16414348c09b81d1dace5021 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/1934 Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins Reviewed-by: Giorgio Arena Tested-by: Arm Jenkins Reviewed-by: Gian Marco Iodice --- src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedKernel.cpp | 5 +++-- tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedKernel.cpp b/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedKernel.cpp index 9630caefd8..222a63d86a 100644 --- a/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedKernel.cpp +++ b/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedKernel.cpp @@ -72,7 +72,8 @@ Status validate_arguments(const ITensorInfo *input0, const ITensorInfo *input1, ARM_COMPUTE_RETURN_ERROR_ON_MSG(((lhs_info.k0 & (lhs_info.k0 - 1)) && lhs_info.k0 != 3), "Only 2,3,4,8,16 are supported for k0"); ARM_COMPUTE_RETURN_ERROR_ON(lhs_info.k0 > 16); ARM_COMPUTE_RETURN_ERROR_ON(lhs_info.m0 < 2 || lhs_info.m0 > 8); - ARM_COMPUTE_RETURN_ERROR_ON_MSG(((rhs_info.n0 & (rhs_info.n0 - 1)) && rhs_info.n0 != 3), "Only 2,3,4,8,16 are supported for n0"); + ARM_COMPUTE_RETURN_ERROR_ON_MSG((lhs_info.transpose) && ((lhs_info.m0 & (lhs_info.m0 - 1)) && lhs_info.m0 != 3), "Only 2,3,4,8,16 are supported for m0"); + ARM_COMPUTE_RETURN_ERROR_ON_MSG((rhs_info.transpose) && ((rhs_info.n0 & (rhs_info.n0 - 1)) && rhs_info.n0 != 3), "Only 2,3,4,8,16 are supported for n0"); ARM_COMPUTE_RETURN_ERROR_ON_MSG((gemm_info.reinterpret_input_as_3d || gemm_info.depth_output_gemm3d != 0) && (input2 != nullptr) && (!gemm_info.broadcast_bias), "Bias addition only supported with broadcast mode in case the input or output has to be reinterpreted as 3D"); @@ -382,4 +383,4 @@ void CLGEMMMatrixMultiplyReshapedKernel::run(const Window &window, cl::CommandQu enqueue(queue, *this, slice, lws_hint(), _use_dummy_work_items); } while(window.slide_window_slice_3D(slice)); -} \ No newline at end of file +} diff --git a/tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp b/tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp index 8d13cdac57..ba218f7cd1 100644 --- a/tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp +++ b/tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp @@ -118,7 +118,7 @@ const auto v0_values_precommit = framework::dataset::make("V0", 1, 3); const auto h0_values_precommit = framework::dataset::make("H0", 1, 3); /** M0 values to test - Nightly */ -const auto m0_values_nightly = framework::dataset::make("M0", 2, 7); +const auto m0_values_nightly = framework::dataset::make("M0", { 2, 3, 4, 8 }); /** N0 values to test - Nightly */ const auto n0_values_nightly = framework::dataset::make("N0", { 2, 3, 4, 8 }); @@ -333,4 +333,4 @@ TEST_SUITE_END() // GEMMMatrixMultiplyReshaped TEST_SUITE_END() // CL } // namespace validation } // namespace test -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute -- cgit v1.2.1