From 45198c8fe5c262cf7fba6f22cfc03ccf194e8bca Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Tue, 14 Apr 2020 22:29:36 +0100 Subject: COMPMID-3239: Implement QSYMM16 LayerNormalizationKernel for CL Use NE/CLSynthetizeFunction instead of NE/CLQLSTMLayerNormalizationValidationFixture Signed-off-by: Sheri Zhang Change-Id: I62ace213a5261f2d307da6953d0521492aa05292 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3019 Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- .../fixtures/QLSTMLayerNormalizationFixture.h | 35 +--------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'tests/validation/fixtures/QLSTMLayerNormalizationFixture.h') diff --git a/tests/validation/fixtures/QLSTMLayerNormalizationFixture.h b/tests/validation/fixtures/QLSTMLayerNormalizationFixture.h index 72af9d9241..cee39c2c82 100644 --- a/tests/validation/fixtures/QLSTMLayerNormalizationFixture.h +++ b/tests/validation/fixtures/QLSTMLayerNormalizationFixture.h @@ -26,10 +26,6 @@ #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" -#ifdef ARM_COMPUTE_CL -#include "arm_compute/runtime/CL/CLScheduler.h" -#endif /* ARM_COMPUTE_CL */ -#include "arm_compute/runtime/NEON/NEScheduler.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/IAccessor.h" @@ -101,8 +97,6 @@ protected: } } - virtual void run_target(FunctionType &fn) = 0; - TensorType compute_target(const TensorShape &input_shape, const TensorShape &weight_shape, const TensorShape &bias_shape) { TensorType input = create_tensor(input_shape, _data_type, 1); @@ -114,8 +108,7 @@ protected: fn.configure(&input, &output, &weight, &bias); allocate_tensors({ &input, &weight, &bias, &output }); fill(AccessorType(input), AccessorType(weight), AccessorType(bias)); - - run_target(fn); + fn.run(); return output; } @@ -138,32 +131,6 @@ protected: DataType _data_type{}; QuantizationInfo _qinfo{}; }; - -template -class NEQLSTMLayerNormalizationValidationFixture : public QLSTMLayerNormalizationValidationFixture -{ -protected: - void run_target(FunctionType &fn) override - { - ThreadInfo tinfo; - tinfo.cpu_info = &NEScheduler::get().cpu_info(); - fn.run(fn.window(), tinfo); - } -}; - -#ifdef ARM_COMPUTE_CL -template -class CLQLSTMLayerNormalizationValidationFixture : public QLSTMLayerNormalizationValidationFixture -{ -protected: - void run_target(FunctionType &fn) override - { - CLScheduler::get().default_init(); - fn.run(fn.window(), CLScheduler::get().queue()); - } -}; -#endif /* ARM_COMPUTE_CL */ - } // namespace validation } // namespace test } // namespace arm_compute -- cgit v1.2.1