From e57eea32c6fdd57e2dbc7e0b0b9b6411f8ce6741 Mon Sep 17 00:00:00 2001 From: Jakub Sujak Date: Mon, 4 Sep 2023 16:53:37 +0100 Subject: Disable CKW ElementwiseBinary tests in Dynamic Fusion - Disable CKW ElementwiseBinary tests A recent change to port DirectConv2d to CKW interface has broken the ElementwiseBinary tests. The fix requires reworking the implicit broadcasting of tensor shapes in CKW and will be delivered separately. - Remove some inapplicable pool2d tests after changing validate function input parameters. Related: COMPMID-6530 Change-Id: Iab87e73fb88ad7517f5ca275e5c873a781ecbc2c Signed-off-by: Jakub Sujak Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10242 Tested-by: Arm Jenkins Reviewed-by: SiCong Li Comments-Addressed: Arm Jenkins --- tests/validation/dynamic_fusion/gpu/cl/Add.cpp | 4 ++++ tests/validation/dynamic_fusion/gpu/cl/Mul.cpp | 4 ++++ tests/validation/dynamic_fusion/gpu/cl/Pool2d.cpp | 27 ++++------------------- tests/validation/dynamic_fusion/gpu/cl/Sub.cpp | 4 ++++ 4 files changed, 16 insertions(+), 23 deletions(-) (limited to 'tests') diff --git a/tests/validation/dynamic_fusion/gpu/cl/Add.cpp b/tests/validation/dynamic_fusion/gpu/cl/Add.cpp index d9a3d9533c..09a8f3fe39 100644 --- a/tests/validation/dynamic_fusion/gpu/cl/Add.cpp +++ b/tests/validation/dynamic_fusion/gpu/cl/Add.cpp @@ -22,6 +22,9 @@ * SOFTWARE. */ +// TODO: Fix testing of CKW Elementwise Binary (COMPMID-6530) +#ifndef ACL_INTERNAL_TEST_CKW_IN_DF + #include "arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h" #include "arm_compute/dynamic_fusion/sketch/gpu/operators/GpuAdd.h" @@ -258,3 +261,4 @@ TEST_SUITE_END() // CL } // namespace validation } // namespace test } // namespace arm_compute +#endif // ACL_INTERNAL_TEST_CKW_IN_DF diff --git a/tests/validation/dynamic_fusion/gpu/cl/Mul.cpp b/tests/validation/dynamic_fusion/gpu/cl/Mul.cpp index 2da2b9eabd..b69479fb7e 100644 --- a/tests/validation/dynamic_fusion/gpu/cl/Mul.cpp +++ b/tests/validation/dynamic_fusion/gpu/cl/Mul.cpp @@ -22,6 +22,9 @@ * SOFTWARE. */ +// TODO: Fix testing of CKW Elementwise Binary (COMPMID-6530) +#ifndef ACL_INTERNAL_TEST_CKW_IN_DF + #include "arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h" #include "arm_compute/dynamic_fusion/sketch/gpu/operators/GpuMul.h" @@ -221,3 +224,4 @@ TEST_SUITE_END() // CL } // namespace validation } // namespace test } // namespace arm_compute +#endif // ACL_INTERNAL_TEST_CKW_IN_DF diff --git a/tests/validation/dynamic_fusion/gpu/cl/Pool2d.cpp b/tests/validation/dynamic_fusion/gpu/cl/Pool2d.cpp index b13364ccf1..411e31b32b 100644 --- a/tests/validation/dynamic_fusion/gpu/cl/Pool2d.cpp +++ b/tests/validation/dynamic_fusion/gpu/cl/Pool2d.cpp @@ -64,40 +64,22 @@ using DFPoolMixedPrecisionFixture = DynamicFusionGpuPool2dMixedPrecisionValidati // *INDENT-OFF* // clang-format off -DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( - framework::dataset::make("InputInfo", { TensorInfo(TensorShape(2U, 27U, 13U), 1, DataType::F32, DataLayout::NHWC), // Mismatching data type - TensorInfo(TensorShape(2U, 27U, 13U), 1, DataType::F32, DataLayout::NHWC), // Invalid pad/size combination - TensorInfo(TensorShape(2U, 27U, 13U), 1, DataType::F32, DataLayout::NHWC), // Invalid pad/size combination - TensorInfo(TensorShape(2U, 27U, 13U), 1, DataType::QASYMM8, DataLayout::NHWC), // Invalid parameters, unsupported pooling +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(2U, 27U, 13U), 1, DataType::QASYMM8, DataLayout::NHWC), // Invalid parameters, unsupported pooling TensorInfo(TensorShape(5U, 15U, 13U), 1, DataType::F32, DataLayout::NHWC), // Valid Non-rectangular Global Pooling - TensorInfo(TensorShape(5U, 13U, 13U), 1, DataType::F32, DataLayout::NHWC), // Invalid output Global Pooling TensorInfo(TensorShape(5U, 13U, 13U), 1, DataType::QASYMM8, DataLayout::NHWC), // Invalid - Quantized not supported. TensorInfo(TensorShape(5U, 13U, 13U), 1, DataType::F32, DataLayout::NHWC), // Valid global pooling TensorInfo(TensorShape(13U, 13U, 5U), 1, DataType::F32, DataLayout::NCHW), // Unsupported data layout }), - framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(2U, 25U, 11U), 1, DataType::F16, DataLayout::NHWC), - TensorInfo(TensorShape(2U, 30U, 11U), 1, DataType::F32, DataLayout::NHWC), - TensorInfo(TensorShape(2U, 25U, 16U), 1, DataType::F32, DataLayout::NHWC), - TensorInfo(TensorShape(2U, 27U, 13U), 1, DataType::QASYMM8, DataLayout::NHWC), - TensorInfo(TensorShape(5U, 1U, 1U), 1, DataType::F32, DataLayout::NHWC), - TensorInfo(TensorShape(5U, 2U, 2U), 1, DataType::F32, DataLayout::NHWC), - TensorInfo(TensorShape(5U, 12U, 12U), 1, DataType::QASYMM8, DataLayout::NHWC), - TensorInfo(TensorShape(5U, 1U, 1U), 1, DataType::F32, DataLayout::NHWC), - TensorInfo(TensorShape(1U, 1U, 5U), 1, DataType::F32, DataLayout::NHWC), - })), framework::dataset::make("Pool2dAttributes", { - Pool2dAttributes().pool_type(PoolingType::AVG).pool_size(Size2D(3,3)).pad(Padding2D(0,0,0,0)).stride(Size2D(1,1)), - Pool2dAttributes().pool_type(PoolingType::AVG).pool_size(Size2D(2,2)).pad(Padding2D(2,2,0,0)).stride(Size2D(1,1)), - Pool2dAttributes().pool_type(PoolingType::AVG).pool_size(Size2D(2,2)).pad(Padding2D(0,0,2,2)).stride(Size2D(1,1)), Pool2dAttributes().pool_type(PoolingType::L2).pool_size(Size2D(3,3)).pad(Padding2D(0,0,0,0)).stride(Size2D(1,1)), Pool2dAttributes().pool_type(PoolingType::AVG).pool_size(Size2D(15U, 13U)), - Pool2dAttributes().pool_type(PoolingType::MAX).pool_size(Size2D(13U, 13U)), Pool2dAttributes().pool_type(PoolingType::AVG).pool_size(Size2D(2,2)).pad(Padding2D()).stride(Size2D(1,1)), Pool2dAttributes().pool_type(PoolingType::AVG).pool_size(Size2D(13U,13U)), Pool2dAttributes().pool_type(PoolingType::AVG).pool_size(Size2D(13U,13U)), })), - framework::dataset::make("Expected", { false, false, false, false, true, false, false, true, false })), - input_info, output_info, pool2d_attr, expected) + framework::dataset::make("Expected", { false, true, false, true, false })), + input_info, pool2d_attr, expected) { // Create a new workload sketch auto cl_compile_ctx = CLKernelLibrary::get().get_compile_context(); @@ -109,7 +91,6 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( // Validate Pool2d Configuration auto src_info = context.create_tensor_info(input_info); - auto dst_info = context.create_tensor_info(output_info); bool res = bool(GpuPool2d::validate_op(sketch, &src_info, pool2d_attr, settings)); ARM_COMPUTE_EXPECT(res == expected, framework::LogLevel::ERRORS); } diff --git a/tests/validation/dynamic_fusion/gpu/cl/Sub.cpp b/tests/validation/dynamic_fusion/gpu/cl/Sub.cpp index 0bb05c2961..022c9b46a8 100644 --- a/tests/validation/dynamic_fusion/gpu/cl/Sub.cpp +++ b/tests/validation/dynamic_fusion/gpu/cl/Sub.cpp @@ -22,6 +22,9 @@ * SOFTWARE. */ +// TODO: Fix testing of CKW Elementwise Binary (COMPMID-6530) +#ifndef ACL_INTERNAL_TEST_CKW_IN_DF + #include "arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h" #include "arm_compute/dynamic_fusion/sketch/gpu/operators/GpuSub.h" @@ -257,3 +260,4 @@ TEST_SUITE_END() // CL } // namespace validation } // namespace test } // namespace arm_compute +#endif // ACL_INTERNAL_TEST_CKW_IN_DF -- cgit v1.2.1