From 04a0706dddc6ca24cb80e3e0789c6b0f54c48b28 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 17 Nov 2020 14:09:01 +0000 Subject: COMPMID-3979 Sanitise Padding Removal epic * Add missing padding immutability asserts in all relevant CL kernels * Remove unnecessary zero padding validation tests. Change-Id: If93f9ccbc988e0286f5e7b135f812141476d5da0 Signed-off-by: SiCong Li Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4446 Reviewed-by: Gian Marco Iodice Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/CL/BatchNormalizationLayer.cpp | 30 ------------------------- 1 file changed, 30 deletions(-) (limited to 'tests/validation/CL/BatchNormalizationLayer.cpp') diff --git a/tests/validation/CL/BatchNormalizationLayer.cpp b/tests/validation/CL/BatchNormalizationLayer.cpp index 88f00b0eff..8b3bdbc3ea 100644 --- a/tests/validation/CL/BatchNormalizationLayer.cpp +++ b/tests/validation/CL/BatchNormalizationLayer.cpp @@ -64,28 +64,6 @@ framework::dataset::make("UseBeta", { false, true })), framework::dataset::make("UseGamma", { false, true })), framework::dataset::make("Epsilon", { 0.001f })); -bool validate_zero_padding(TensorShape shape0, const TensorShape shape1, float epsilon, ActivationLayerInfo act_info, DataType dt, DataLayout data_layout) -{ - if(data_layout == DataLayout::NHWC) - { - permute(shape0, PermutationVector(2U, 0U, 1U)); - } - - // Create tensors - CLTensor src = create_tensor(shape0, dt, 1, QuantizationInfo(), data_layout); - CLTensor dst = create_tensor(shape0, dt, 1, QuantizationInfo(), data_layout); - CLTensor mean = create_tensor(shape1, dt, 1); - CLTensor var = create_tensor(shape1, dt, 1); - CLTensor beta = create_tensor(shape1, dt, 1); - CLTensor gamma = create_tensor(shape1, dt, 1); - - // Create and configure function - CLBatchNormalizationLayer norm; - norm.configure(&src, &dst, &mean, &var, &beta, &gamma, epsilon, act_info); - - return src.info()->padding().empty() && dst.info()->padding().empty() && mean.info()->padding().empty() && var.info()->padding().empty() && beta.info()->padding().empty() - && gamma.info()->padding().empty(); -} } // namespace TEST_SUITE(CL) @@ -142,14 +120,6 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip( // clang-format on // *INDENT-ON* -DATA_TEST_CASE(ValidateZeroPadding, framework::DatasetMode::ALL, combine(combine(combine(datasets::SmallRandomBatchNormalizationLayerDataset(), act_infos), framework::dataset::make("DataType", { DataType::F32, DataType::F16 })), - framework::dataset::make("DataLayout", { DataLayout::NHWC })), - shape0, shape1, episilon, act_infos, data_type, data_layout) -{ - bool status = validate_zero_padding(shape0, shape1, episilon, act_infos, data_type, data_layout); - ARM_COMPUTE_EXPECT(status, framework::LogLevel::ERRORS); -} - TEST_SUITE(Float) TEST_SUITE(FP32) FIXTURE_DATA_TEST_CASE(Random, CLBatchNormalizationLayerFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallRandomBatchNormalizationLayerDataset(), -- cgit v1.2.1