diff options
| author | SiCong Li <sicong.li@arm.com> | 2020-08-26 13:55:15 +0100 |
|---|---|---|
| committer | SiCong Li <sicong.li@arm.com> | 2020-08-28 13:00:32 +0000 |
| commit | 5bdde8509542e942e908e9d508dd39c73194abfb (patch) | |
| tree | 23ebe231e1bd04f0923589878f6c7cf930b033cf /tests | |
| parent | ce7c44117918ed4d01c60010565d942d2221748e (diff) | |
| download | ComputeLibrary-5bdde8509542e942e908e9d508dd39c73194abfb.tar.gz | |
COMPMID-3670 Extend cl image support to f16 in CLGEMMReshapeRHSMatrixKernel
Change-Id: Ic0569fe9ed99e61084b601ce84ddc7ef288d1899
Signed-off-by: SiCong Li <sicong.li@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3852
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp | 4 | ||||
| -rw-r--r-- | tests/validation/CL/GEMMReshapeRHSMatrix.cpp | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp b/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp index bd0cd03ca7..afb2807d01 100644 --- a/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp +++ b/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp @@ -295,7 +295,7 @@ TEST_SUITE(GEMMMatrixMultiplyReshapedOnlyRHS) * - Incorrect input0 dimension when input is reinterpreted as 3D: input0->dimension(1) * input0->dimension(2) != m * - Correct support for creating an OpenCL image object from buffer * - Incorrect support for creating an OpenCL image object from buffer. N0 is 2 but it can only be 4,8 and 16 - * - Incorrect support for creating an OpenCL image object from buffer. Data type is F16 but it can only be F32 + * - Correct F16 support for creating an OpenCL image object from buffer. */ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(zip(zip(zip(zip(zip(zip(zip(zip(zip( framework::dataset::make("batch_size", { 1, 1, 1, 1, 1, 1, 2, 1, 1, 1 }), @@ -311,7 +311,7 @@ framework::dataset::make("data_type_input1", { DataType::F32, DataType::F32, framework::dataset::make("data_type_input2", { DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F16})), framework::dataset::make("data_type_output", { DataType::F16, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F32, DataType::F16})), framework::dataset::make("Beta", { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f , 1.0f})), -framework::dataset::make("Expected", { false, false, false, false, false, false, false, true, false, false })), +framework::dataset::make("Expected", { false, false, false, false, false, false, false, true, false, true })), b_value, m0_value, n0_value, k0_value, broadcast_bias, input_as_3d, depth_output_gemm3d, export_to_cl_image, dt_input0, dt_intpu1, dt_input2, dt_output, beta, expected) { bool expected_value = expected; diff --git a/tests/validation/CL/GEMMReshapeRHSMatrix.cpp b/tests/validation/CL/GEMMReshapeRHSMatrix.cpp index c7b0752cc8..579ed32afe 100644 --- a/tests/validation/CL/GEMMReshapeRHSMatrix.cpp +++ b/tests/validation/CL/GEMMReshapeRHSMatrix.cpp @@ -46,9 +46,6 @@ namespace { // *INDENT-OFF* // clang-format off -/** Data types */ -const auto data_types = framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }); - /** Batch size values to test */ const auto b_values = framework::dataset::make("batchsize", 1, 3); @@ -124,19 +121,20 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(zip( ARM_COMPUTE_EXPECT(has_error == expected, framework::LogLevel::ERRORS); } -DATA_TEST_CASE(ValidatePadding, framework::DatasetMode::ALL, combine(combine(combine( +DATA_TEST_CASE(ValidatePadding, framework::DatasetMode::ALL, combine(combine(combine(combine( framework::dataset::make("InputShape", { TensorShape(32U, 16U, 1U), TensorShape(32U, 16U, 2U) }), framework::dataset::make("N0",{ 4 })), framework::dataset::make("K0",{ 4, 8, 16 })), framework::dataset::make("H0",{ 1, 2, 4 })), - input_shape, n0, k0, h0) + framework::dataset::make("DataType",{ DataType::F32, DataType::F16 })), + input_shape, n0, k0, h0, data_type) { CLTensor input; CLTensor output; - input.info()->init(input_shape, 1, DataType::F32); + input.info()->init(input_shape, 1, data_type); unsigned int padding = 0; |