From fdf56fb9d414a754e7cedfdc1351ab0ce2866a0c Mon Sep 17 00:00:00 2001 From: Viet-Hoa Do Date: Thu, 18 Jan 2024 16:10:46 +0000 Subject: Make GpuWorkloadContext own all tensor info objects * The tensor info objects created by calling create_tensor_info is now solely owned by the context object. The user only receives pointers to those objects. - Internally pointers to tensor info objects are used in various places. It's safer for dynamic fusion to manage these objects directly rather than relying on the users. - The validation test is updated to use the modified API. * Make various changes in dynamic fusion API to make it more friendly (e.g. making some of the objects moveable). Partially resolves: COMPMID-6707 Signed-off-by: Viet-Hoa Do Change-Id: Ifee70e53c05f8e7b72bf9ef123701ff291c5ee80 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10990 Tested-by: Arm Jenkins Reviewed-by: Jakub Sujak Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- .../dynamic_fusion/operators/ActivationFixture.h | 76 ++--- .../dynamic_fusion/operators/CastFixture.h | 53 ++-- .../dynamic_fusion/operators/ClampFixture.h | 22 +- .../fixtures/dynamic_fusion/operators/MulFixture.h | 326 +++++++++++---------- .../dynamic_fusion/operators/ReshapeFixture.h | 35 +-- .../dynamic_fusion/operators/ResizeFixture.h | 132 +++++---- .../dynamic_fusion/operators/SoftmaxFixture.h | 53 ++-- 7 files changed, 365 insertions(+), 332 deletions(-) (limited to 'tests/validation/fixtures/dynamic_fusion/operators') diff --git a/tests/validation/fixtures/dynamic_fusion/operators/ActivationFixture.h b/tests/validation/fixtures/dynamic_fusion/operators/ActivationFixture.h index 18c3b6bfbb..2f0b13329d 100644 --- a/tests/validation/fixtures/dynamic_fusion/operators/ActivationFixture.h +++ b/tests/validation/fixtures/dynamic_fusion/operators/ActivationFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Arm Limited. + * Copyright (c) 2023-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -22,8 +22,8 @@ * SOFTWARE. */ -#ifndef TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_ACTIVATIONFIXTURE -#define TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_ACTIVATIONFIXTURE +#ifndef ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_ACTIVATIONFIXTURE_H +#define ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_ACTIVATIONFIXTURE_H #include "arm_compute/core/CL/CLKernelLibrary.h" #include "arm_compute/core/TensorInfo.h" @@ -49,11 +49,11 @@ class DynamicFusionActivationValidationFixture : public framework::Fixture public: void setup(TensorShape shape, bool fuse, DataType data_type, ActivationLayerInfo act_info, TArgs... args) { - _fuse = fuse; - _data_type = data_type; - _function = act_info.activation(); - _target = compute_target(shape, args...); - _reference = compute_reference(shape, act_info); + _fuse = fuse; + _data_type = data_type; + _function = act_info.activation(); + _target = compute_target(shape, args...); + _reference = compute_reference(shape, act_info); } protected: @@ -73,17 +73,19 @@ protected: // To ensure all the inserted values are within the given range after subtracing/adding delta auto insert_values = [&boundary_values, &min, &max](const std::initializer_list &new_values) { - for(auto &v : new_values) + for (auto &v : new_values) { - if(v >= min && v <= max) + if (v >= min && v <= max) { boundary_values.emplace_back(v); } } }; - insert_values({ min, static_cast(min + delta), static_cast(lower_quarter), static_cast(center_value - delta) }); // lower partition - insert_values({ static_cast(center_value), static_cast(center_value + delta), static_cast(upper_quarter), static_cast(max - delta), max }); // upper partition + insert_values({min, static_cast(min + delta), static_cast(lower_quarter), + static_cast(center_value - delta)}); // lower partition + insert_values({static_cast(center_value), static_cast(center_value + delta), + static_cast(upper_quarter), static_cast(max - delta), max}); // upper partition return boundary_values; } @@ -91,8 +93,8 @@ protected: template void fill(U &&tensor) { - float min_bound = 0; - float max_bound = 0; + float min_bound = 0; + float max_bound = 0; std::tie(min_bound, max_bound) = get_activation_layer_test_bounds(_function, _data_type); library->fill_static_values(tensor, get_boundary_values(static_cast(min_bound), static_cast(max_bound))); } @@ -101,22 +103,22 @@ protected: { // Create a new workload sketch CLCompileContext cl_compile_ctx = CLKernelLibrary::get().get_compile_context(); - GpuWorkloadContext context{ &cl_compile_ctx }; - GpuWorkloadSketch sketch{ &context }; + GpuWorkloadContext context{&cl_compile_ctx}; + GpuWorkloadSketch sketch{&context}; // Create sketch tensors - TensorInfo src_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type)); - TensorInfo dst_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type)); + ITensorInfo *src_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type)); + ITensorInfo *dst_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type)); - ITensorInfo *ans_0_info = FunctionType::create_op(sketch, &src_info, args...); - if(_fuse) + ITensorInfo *ans_0_info = FunctionType::create_op(sketch, src_info, args...); + if (_fuse) { ITensorInfo *ans_1_info = FunctionType::create_op(sketch, ans_0_info, args...); - GpuOutput::create_op(sketch, ans_1_info, &dst_info); + GpuOutput::create_op(sketch, ans_1_info, dst_info); } else { - GpuOutput::create_op(sketch, ans_0_info, &dst_info); + GpuOutput::create_op(sketch, ans_0_info, dst_info); } // Configure runtime @@ -128,8 +130,8 @@ protected: TensorType t_dst{}; // Initialize user tensors - t_src.allocator()->init(src_info); - t_dst.allocator()->init(dst_info); + t_src.allocator()->init(*src_info); + t_dst.allocator()->init(*dst_info); // Allocate and fill user tensors t_src.allocator()->allocate(); @@ -138,7 +140,7 @@ protected: fill(AccessorType(t_src)); // Run runtime - runtime.run({ &t_src, &t_dst }); + runtime.run({&t_src, &t_dst}); return t_dst; } @@ -146,14 +148,14 @@ protected: SimpleTensor compute_reference(const TensorShape &shape, ActivationLayerInfo act_info) { // Create reference - SimpleTensor src{ shape, _data_type, 1 }; + SimpleTensor src{shape, _data_type, 1}; // Fill reference fill(src); auto tmp = reference::activation_layer(src, act_info); - if(_fuse) + if (_fuse) { auto dst = reference::activation_layer(tmp, act_info); return dst; @@ -166,31 +168,35 @@ protected: protected: ActivationLayerInfo::ActivationFunction _function{}; - bool _fuse{ false }; + bool _fuse{false}; DataType _data_type{}; TensorType _target{}; SimpleTensor _reference{}; }; template -class DynamicFusionSigmoidValidationFixture : public DynamicFusionActivationValidationFixture +class DynamicFusionSigmoidValidationFixture + : public DynamicFusionActivationValidationFixture { public: void setup(TensorShape shape, bool fuse, DataType data_type) { - ActivationLayerInfo act_info{ ActivationLayerInfo::ActivationFunction::LOGISTIC }; - DynamicFusionActivationValidationFixture::setup(shape, fuse, data_type, act_info); + ActivationLayerInfo act_info{ActivationLayerInfo::ActivationFunction::LOGISTIC}; + DynamicFusionActivationValidationFixture::setup(shape, fuse, + data_type, act_info); } }; template -class DynamicFusionTanhValidationFixture : public DynamicFusionActivationValidationFixture +class DynamicFusionTanhValidationFixture + : public DynamicFusionActivationValidationFixture { public: void setup(TensorShape shape, bool fuse, DataType data_type) { - ActivationLayerInfo act_info{ ActivationLayerInfo::ActivationFunction::TANH }; - DynamicFusionActivationValidationFixture::setup(shape, fuse, data_type, act_info); + ActivationLayerInfo act_info{ActivationLayerInfo::ActivationFunction::TANH}; + DynamicFusionActivationValidationFixture::setup(shape, fuse, + data_type, act_info); } }; @@ -198,4 +204,4 @@ public: } // namespace test } // namespace arm_compute -#endif /* TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_ACTIVATIONFIXTURE */ +#endif // ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_ACTIVATIONFIXTURE_H diff --git a/tests/validation/fixtures/dynamic_fusion/operators/CastFixture.h b/tests/validation/fixtures/dynamic_fusion/operators/CastFixture.h index d8e250cb36..edf0dff54b 100644 --- a/tests/validation/fixtures/dynamic_fusion/operators/CastFixture.h +++ b/tests/validation/fixtures/dynamic_fusion/operators/CastFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Arm Limited. + * Copyright (c) 2022-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CASTFIXTURE -#define TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CASTFIXTURE +#ifndef ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CASTFIXTURE_H +#define ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CASTFIXTURE_H #include "arm_compute/core/CL/CLKernelLibrary.h" #include "arm_compute/core/TensorInfo.h" @@ -58,14 +58,14 @@ protected: void fill(U &&tensor, int i, DataType dt_in, DataType dt_out) { // Restricting range to avoid inf values - if(dt_out == DataType::F16) + if (dt_out == DataType::F16) { constexpr int signed_min = -32000; constexpr int signed_max = 32000; constexpr int unsigned_min = 0; constexpr int unsigned_max = 65000; - switch(dt_in) + switch (dt_in) { case DataType::U8: case DataType::QASYMM8: @@ -78,22 +78,26 @@ protected: } case DataType::U16: { - library->fill_tensor_uniform(tensor, i, static_cast(unsigned_min), static_cast(unsigned_max)); + library->fill_tensor_uniform(tensor, i, static_cast(unsigned_min), + static_cast(unsigned_max)); break; } case DataType::S16: { - library->fill_tensor_uniform(tensor, i, static_cast(signed_min), static_cast(signed_max)); + library->fill_tensor_uniform(tensor, i, static_cast(signed_min), + static_cast(signed_max)); break; } case DataType::U32: { - library->fill_tensor_uniform(tensor, i, static_cast(unsigned_min), static_cast(unsigned_max)); + library->fill_tensor_uniform(tensor, i, static_cast(unsigned_min), + static_cast(unsigned_max)); break; } case DataType::S32: { - library->fill_tensor_uniform(tensor, i, static_cast(signed_min), static_cast(signed_max)); + library->fill_tensor_uniform(tensor, i, static_cast(signed_min), + static_cast(signed_max)); break; } default: @@ -107,29 +111,31 @@ protected: } // Given input is in nchw format - TensorType compute_target(const TensorShape &shape, const DataType dt_in, const DataType dt_out, const ConvertPolicy policy) + TensorType + compute_target(const TensorShape &shape, const DataType dt_in, const DataType dt_out, const ConvertPolicy policy) { // Create a new workload sketch auto cl_compile_ctx = CLKernelLibrary::get().get_compile_context(); - auto context = GpuWorkloadContext{ &cl_compile_ctx }; - GpuWorkloadSketch sketch{ &context }; + auto context = GpuWorkloadContext{&cl_compile_ctx}; + GpuWorkloadSketch sketch{&context}; // Create sketch tensors - TensorInfo src_info = context.create_tensor_info(TensorInfo(shape, 1, dt_in, DataLayout::NCHW)); // layout is not important - TensorInfo dst_info = context.create_tensor_info(); + ITensorInfo *src_info = + context.create_tensor_info(TensorInfo(shape, 1, dt_in, DataLayout::NCHW)); // layout is not important + ITensorInfo *dst_info = context.create_tensor_info(); CastAttributes attributes; attributes.convert_policy(policy).data_type(dt_out); - ITensorInfo *ans_info = FunctionType::create_op(sketch, &src_info, attributes); - GpuOutput::create_op(sketch, ans_info, &dst_info); + ITensorInfo *ans_info = FunctionType::create_op(sketch, src_info, attributes); + GpuOutput::create_op(sketch, ans_info, dst_info); // Configure runtime ClWorkloadRuntime runtime; runtime.configure(sketch); // (Important) Allocate auxiliary tensor memory if there are any - for(auto &data : runtime.get_auxiliary_tensors()) + for (auto &data : runtime.get_auxiliary_tensors()) { CLTensor *tensor = std::get<0>(data); TensorInfo info = std::get<1>(data); @@ -143,8 +149,8 @@ protected: TensorType t_dst{}; // Initialize user tensors - t_src.allocator()->init(src_info); - t_dst.allocator()->init(dst_info); + t_src.allocator()->init(*src_info); + t_dst.allocator()->init(*dst_info); // Allocate and fill user tensors t_src.allocator()->allocate(); @@ -153,14 +159,15 @@ protected: fill(AccessorType(t_src), 0, dt_in, dt_out); // Run runtime - runtime.run({ &t_src, &t_dst }); + runtime.run({&t_src, &t_dst}); return t_dst; } - SimpleTensor compute_reference(const TensorShape &shape, const DataType dt_in, const DataType dt_out, const ConvertPolicy policy) + SimpleTensor + compute_reference(const TensorShape &shape, const DataType dt_in, const DataType dt_out, const ConvertPolicy policy) { // Create reference - SimpleTensor src{ shape, dt_in, 1 }; + SimpleTensor src{shape, dt_in, 1}; // Fill reference fill(src, 0, dt_in, dt_out); @@ -174,4 +181,4 @@ protected: } // namespace validation } // namespace test } // namespace arm_compute -#endif /* TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CASTFIXTURE */ +#endif // ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CASTFIXTURE_H diff --git a/tests/validation/fixtures/dynamic_fusion/operators/ClampFixture.h b/tests/validation/fixtures/dynamic_fusion/operators/ClampFixture.h index 3c325d739c..e8f6f83e42 100644 --- a/tests/validation/fixtures/dynamic_fusion/operators/ClampFixture.h +++ b/tests/validation/fixtures/dynamic_fusion/operators/ClampFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Arm Limited. + * Copyright (c) 2022-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CLAMPFIXTURE -#define TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CLAMPFIXTURE +#ifndef ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CLAMPFIXTURE_H +#define ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CLAMPFIXTURE_H #include "arm_compute/core/CL/CLKernelLibrary.h" #include "arm_compute/core/TensorInfo.h" @@ -107,18 +107,18 @@ protected: GpuWorkloadSketch sketch{ &context }; // Create sketch tensors - TensorInfo src_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type)); - TensorInfo dst_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type)); + ITensorInfo* src_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type)); + ITensorInfo* dst_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type)); - ITensorInfo *ans_0_info = FunctionType::create_op(sketch, &src_info, attributes); + ITensorInfo *ans_0_info = FunctionType::create_op(sketch, src_info, attributes); if(_fuse) { ITensorInfo *ans_1_info = FunctionType::create_op(sketch, ans_0_info, attributes); - GpuOutput::create_op(sketch, ans_1_info, &dst_info); + GpuOutput::create_op(sketch, ans_1_info, dst_info); } else { - GpuOutput::create_op(sketch, ans_0_info, &dst_info); + GpuOutput::create_op(sketch, ans_0_info, dst_info); } // Configure runtime @@ -130,8 +130,8 @@ protected: TensorType t_dst{}; // Initialize user tensors - t_src.allocator()->init(src_info); - t_dst.allocator()->init(dst_info); + t_src.allocator()->init(*src_info); + t_dst.allocator()->init(*dst_info); // Allocate and fill user tensors t_src.allocator()->allocate(); @@ -168,4 +168,4 @@ protected: } // namespace validation } // namespace test } // namespace arm_compute -#endif /* TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CLAMPFIXTURE */ +#endif // ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_CLAMPFIXTURE_H diff --git a/tests/validation/fixtures/dynamic_fusion/operators/MulFixture.h b/tests/validation/fixtures/dynamic_fusion/operators/MulFixture.h index 02dc996ffa..f02aa5e36a 100644 --- a/tests/validation/fixtures/dynamic_fusion/operators/MulFixture.h +++ b/tests/validation/fixtures/dynamic_fusion/operators/MulFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Arm Limited. + * Copyright (c) 2023-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_MULFIXTURE -#define TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_MULFIXTURE +#ifndef ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_MULFIXTURE_H +#define ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_MULFIXTURE_H #include "arm_compute/core/CL/CLKernelLibrary.h" #include "arm_compute/core/TensorInfo.h" @@ -31,9 +31,9 @@ #include "arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h" #include "arm_compute/dynamic_fusion/sketch/gpu/operators/GpuOutput.h" -#include "tests/Globals.h" #include "tests/framework/Fixture.h" #include "tests/framework/Macros.h" +#include "tests/Globals.h" #include "tests/validation/reference/PixelWiseMultiplication.h" using namespace arm_compute::experimental::dynamic_fusion; @@ -52,180 +52,188 @@ template - void fill(U &&tensor, int i) - { - library->fill_tensor_uniform(tensor, i); - } - - TensorType compute_target(const TensorShape &shape0, const TensorShape &shape1, const TensorShape &shape2) - { - // Create a new workload sketch - auto cl_compile_ctx = CLKernelLibrary::get().get_compile_context(); - auto context = GpuWorkloadContext{ &cl_compile_ctx }; - GpuWorkloadSketch sketch{ &context }; - - // Fuse first multiplication op - TensorInfo lhs_info = context.create_tensor_info(TensorInfo(shape0, 1, _data_type)); - TensorInfo rhs_info = context.create_tensor_info(TensorInfo(shape1, 1, _data_type)); - TensorInfo dst_info = context.create_tensor_info(); - - TensorInfo rhs_info_fuse; - - ITensorInfo *ans_info = FunctionType::create_op(sketch, &lhs_info, &rhs_info); - - if(_fuse) - { - rhs_info_fuse = context.create_tensor_info(TensorInfo(shape2, 1, _data_type)); - ITensorInfo *ans2_info = FunctionType::create_op(sketch, ans_info, &rhs_info_fuse); - GpuOutput::create_op(sketch, ans2_info, &dst_info); - } - else - { - GpuOutput::create_op(sketch, ans_info, &dst_info); - } - - // Configure runtime - ClWorkloadRuntime runtime; - runtime.configure(sketch); - - // (Important) Allocate auxiliary tensor memory if there are any - for(auto &data : runtime.get_auxiliary_tensors()) - { - CLTensor *tensor = std::get<0>(data); - TensorInfo info = std::get<1>(data); - AuxMemoryInfo aux_mem_req = std::get<2>(data); - tensor->allocator()->init(info, aux_mem_req.alignment); - tensor->allocator()->allocate(); // Use ACL allocated memory - } - - // Construct user tensors - TensorType t_lhs{}; - TensorType t_rhs{}; - TensorType t_rhs_fuse{}; - TensorType t_dst{}; - - // Initialize user tensors - t_lhs.allocator()->init(lhs_info); - t_rhs.allocator()->init(rhs_info); - t_dst.allocator()->init(dst_info); - if(_fuse) - { - t_rhs_fuse.allocator()->init(rhs_info_fuse); - } - - // Allocate and fill user tensors - // Instead of using ACL allocator, the user can choose to import memory into the tensors - t_lhs.allocator()->allocate(); - t_rhs.allocator()->allocate(); - t_dst.allocator()->allocate(); - if(_fuse) - { - t_rhs_fuse.allocator()->allocate(); - } - - fill(AccessorType(t_lhs), 0); - fill(AccessorType(t_rhs), 1); - if(_fuse) - { - fill(AccessorType(t_rhs_fuse), 2); - } - - // Run runtime - if(_fuse) - { - runtime.run({ &t_lhs, &t_rhs, &t_rhs_fuse, &t_dst }); - } - else - { - runtime.run({ &t_lhs, &t_rhs, &t_dst }); - } - - return t_dst; - } - - SimpleTensor compute_reference(const TensorShape &shape0, const TensorShape &shape1, const TensorShape &shape2) - { - // Create reference - SimpleTensor ref_lhs{ shape0, _data_type, 1, QuantizationInfo() }; - SimpleTensor ref_rhs{ shape1, _data_type, 1, QuantizationInfo() }; - SimpleTensor ref_rhs_fuse{ shape2, _data_type, 1, QuantizationInfo() }; - - // Fill reference - fill(ref_lhs, 0); - fill(ref_rhs, 1); - SimpleTensor ref_dst = reference::pixel_wise_multiplication(ref_lhs, - ref_rhs, - 1.f, - ConvertPolicy::SATURATE, - RoundingPolicy::TO_NEAREST_UP, - _data_type, - QuantizationInfo()); - if(_fuse) - { - fill(ref_rhs_fuse, 2); - SimpleTensor ref_dst_fuse = reference::pixel_wise_multiplication(ref_dst, - ref_rhs_fuse, - 1.f, - ConvertPolicy::SATURATE, - RoundingPolicy::TO_NEAREST_UP, - _data_type, - QuantizationInfo()); - return ref_dst_fuse; - } - return ref_dst; - } - - TensorType _target{}; - SimpleTensor _reference{}; - DataType _data_type{}; - bool _is_inplace{ false }; - bool _fuse{ false }; + template + void fill(U &&tensor, int i) + { + library->fill_tensor_uniform(tensor, i); + } + + TensorType compute_target(const TensorShape &shape0, const TensorShape &shape1, const TensorShape &shape2) + { + // Create a new workload sketch + auto cl_compile_ctx = CLKernelLibrary::get().get_compile_context(); + auto context = GpuWorkloadContext{&cl_compile_ctx}; + GpuWorkloadSketch sketch{&context}; + + // Fuse first multiplication op + ITensorInfo *lhs_info = context.create_tensor_info(TensorInfo(shape0, 1, _data_type)); + ITensorInfo *rhs_info = context.create_tensor_info(TensorInfo(shape1, 1, _data_type)); + ITensorInfo *dst_info = context.create_tensor_info(); + + ITensorInfo *rhs_info_fuse = nullptr; + + ITensorInfo *ans_info = FunctionType::create_op(sketch, lhs_info, rhs_info); + + if (_fuse) + { + rhs_info_fuse = context.create_tensor_info(TensorInfo(shape2, 1, _data_type)); + ITensorInfo *ans2_info = FunctionType::create_op(sketch, ans_info, rhs_info_fuse); + GpuOutput::create_op(sketch, ans2_info, dst_info); + } + else + { + GpuOutput::create_op(sketch, ans_info, dst_info); + } + + // Configure runtime + ClWorkloadRuntime runtime; + runtime.configure(sketch); + + // (Important) Allocate auxiliary tensor memory if there are any + for (auto &data : runtime.get_auxiliary_tensors()) + { + CLTensor *tensor = std::get<0>(data); + TensorInfo info = std::get<1>(data); + AuxMemoryInfo aux_mem_req = std::get<2>(data); + tensor->allocator()->init(info, aux_mem_req.alignment); + tensor->allocator()->allocate(); // Use ACL allocated memory + } + + // Construct user tensors + TensorType t_lhs{}; + TensorType t_rhs{}; + TensorType t_rhs_fuse{}; + TensorType t_dst{}; + + // Initialize user tensors + t_lhs.allocator()->init(*lhs_info); + t_rhs.allocator()->init(*rhs_info); + t_dst.allocator()->init(*dst_info); + if (_fuse) + { + t_rhs_fuse.allocator()->init(*rhs_info_fuse); + } + + // Allocate and fill user tensors + // Instead of using ACL allocator, the user can choose to import memory into the tensors + t_lhs.allocator()->allocate(); + t_rhs.allocator()->allocate(); + t_dst.allocator()->allocate(); + if (_fuse) + { + t_rhs_fuse.allocator()->allocate(); + } + + fill(AccessorType(t_lhs), 0); + fill(AccessorType(t_rhs), 1); + if (_fuse) + { + fill(AccessorType(t_rhs_fuse), 2); + } + + // Run runtime + if (_fuse) + { + runtime.run({&t_lhs, &t_rhs, &t_rhs_fuse, &t_dst}); + } + else + { + runtime.run({&t_lhs, &t_rhs, &t_dst}); + } + + return t_dst; + } + + SimpleTensor compute_reference(const TensorShape &shape0, const TensorShape &shape1, const TensorShape &shape2) + { + // Create reference + SimpleTensor ref_lhs{shape0, _data_type, 1, QuantizationInfo()}; + SimpleTensor ref_rhs{shape1, _data_type, 1, QuantizationInfo()}; + SimpleTensor ref_rhs_fuse{shape2, _data_type, 1, QuantizationInfo()}; + + // Fill reference + fill(ref_lhs, 0); + fill(ref_rhs, 1); + SimpleTensor ref_dst = reference::pixel_wise_multiplication( + ref_lhs, ref_rhs, 1.f, ConvertPolicy::SATURATE, RoundingPolicy::TO_NEAREST_UP, _data_type, + QuantizationInfo()); + if (_fuse) + { + fill(ref_rhs_fuse, 2); + SimpleTensor ref_dst_fuse = reference::pixel_wise_multiplication( + ref_dst, ref_rhs_fuse, 1.f, ConvertPolicy::SATURATE, RoundingPolicy::TO_NEAREST_UP, _data_type, + QuantizationInfo()); + return ref_dst_fuse; + } + return ref_dst; + } + + TensorType _target{}; + SimpleTensor _reference{}; + DataType _data_type{}; + bool _is_inplace{false}; + bool _fuse{false}; }; template -class DynamicFusionMulOneOpValidationFixture : public DynamicFusionMulValidationFixture +class DynamicFusionMulOneOpValidationFixture + : public DynamicFusionMulValidationFixture { public: - void setup(const TensorShape &shape0, DataType data_type, bool is_inplace) - { - DynamicFusionMulValidationFixture::setup(shape0, shape0, TensorShape(), data_type, is_inplace); - } + void setup(const TensorShape &shape0, DataType data_type, bool is_inplace) + { + DynamicFusionMulValidationFixture::setup( + shape0, shape0, TensorShape(), data_type, is_inplace); + } }; template -class DynamicFusionMulBroadcastValidationFixture : public DynamicFusionMulValidationFixture +class DynamicFusionMulBroadcastValidationFixture + : public DynamicFusionMulValidationFixture { public: - void setup(const TensorShape &shape0, const TensorShape &shape1, DataType data_type, bool is_inplace) - { - DynamicFusionMulValidationFixture::setup(shape0, shape1, TensorShape(), data_type, is_inplace); - } + void setup(const TensorShape &shape0, const TensorShape &shape1, DataType data_type, bool is_inplace) + { + DynamicFusionMulValidationFixture::setup( + shape0, shape1, TensorShape(), data_type, is_inplace); + } }; template -class DynamicFusionMulTwoOpsValidationFixture : public DynamicFusionMulValidationFixture +class DynamicFusionMulTwoOpsValidationFixture + : public DynamicFusionMulValidationFixture { public: - void setup(const TensorShape &shape0, const TensorShape &shape1, const TensorShape &shape2, DataType data_type, bool is_inplace, bool fuse_two_ops) - { - DynamicFusionMulValidationFixture::setup(shape0, shape1, shape2, data_type, is_inplace, fuse_two_ops); - } + void setup(const TensorShape &shape0, + const TensorShape &shape1, + const TensorShape &shape2, + DataType data_type, + bool is_inplace, + bool fuse_two_ops) + { + DynamicFusionMulValidationFixture::setup( + shape0, shape1, shape2, data_type, is_inplace, fuse_two_ops); + } }; } // namespace validation } // namespace test } // namespace arm_compute -#endif /* TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_MULFIXTURE */ +#endif // ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_MULFIXTURE_H diff --git a/tests/validation/fixtures/dynamic_fusion/operators/ReshapeFixture.h b/tests/validation/fixtures/dynamic_fusion/operators/ReshapeFixture.h index abfc6459d6..bde3360940 100644 --- a/tests/validation/fixtures/dynamic_fusion/operators/ReshapeFixture.h +++ b/tests/validation/fixtures/dynamic_fusion/operators/ReshapeFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Arm Limited. + * Copyright (c) 2023-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESHAPEFIXTURE -#define TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESHAPEFIXTURE +#ifndef ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESHAPEFIXTURE_H +#define ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESHAPEFIXTURE_H #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" @@ -33,9 +33,9 @@ #include "arm_compute/dynamic_fusion/sketch/gpu/operators/GpuOutput.h" #include "arm_compute/dynamic_fusion/sketch/gpu/operators/GpuReshape.h" -#include "tests/Globals.h" #include "tests/framework/Asserts.h" #include "tests/framework/Fixture.h" +#include "tests/Globals.h" #include "tests/validation/reference/ReshapeLayer.h" using namespace arm_compute::experimental::dynamic_fusion; @@ -70,24 +70,24 @@ protected: // Create a new workload sketch auto cl_compile_ctx = CLKernelLibrary::get().get_compile_context(); - auto context = GpuWorkloadContext{ &cl_compile_ctx }; - GpuWorkloadSketch sketch{ &context }; + auto context = GpuWorkloadContext{&cl_compile_ctx}; + GpuWorkloadSketch sketch{&context}; // Create sketch tensors - TensorInfo src_info = context.create_tensor_info(TensorInfo(input_shape, 1, data_type)); - TensorInfo dst_info = context.create_tensor_info(TensorInfo(output_shape, 1, data_type)); + ITensorInfo *src_info = context.create_tensor_info(TensorInfo(input_shape, 1, data_type)); + ITensorInfo *dst_info = context.create_tensor_info(TensorInfo(output_shape, 1, data_type)); ReshapeAttributes attributes; attributes.shape(output_shape); - ITensorInfo *ans_info = FunctionType::create_op(sketch, &src_info, attributes); - GpuOutput::create_op(sketch, ans_info, &dst_info); + ITensorInfo *ans_info = FunctionType::create_op(sketch, src_info, attributes); + GpuOutput::create_op(sketch, ans_info, dst_info); // Configure runtime ClWorkloadRuntime runtime; runtime.configure(sketch); // (Important) Allocate auxiliary tensor memory if there are any - for(auto &data : runtime.get_auxiliary_tensors()) + for (auto &data : runtime.get_auxiliary_tensors()) { CLTensor *tensor = std::get<0>(data); TensorInfo info = std::get<1>(data); @@ -100,8 +100,8 @@ protected: TensorType t_src{}; TensorType t_dst{}; // Initialize user tensors - t_src.allocator()->init(src_info); - t_dst.allocator()->init(dst_info); + t_src.allocator()->init(*src_info); + t_dst.allocator()->init(*dst_info); // Allocate and fill user tensors t_src.allocator()->allocate(); @@ -110,15 +110,16 @@ protected: fill(AccessorType(t_src), 0); // Run runtime - runtime.run({ &t_src, &t_dst }); + runtime.run({&t_src, &t_dst}); return t_dst; } - SimpleTensor compute_reference(const TensorShape &input_shape, const TensorShape &output_shape, DataType data_type) + SimpleTensor + compute_reference(const TensorShape &input_shape, const TensorShape &output_shape, DataType data_type) { // Create reference - SimpleTensor src{ input_shape, data_type }; + SimpleTensor src{input_shape, data_type}; // Fill reference fill(src, 0); @@ -133,4 +134,4 @@ protected: } // namespace validation } // namespace test } // namespace arm_compute -#endif /* TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESHAPEFIXTURE */ +#endif // ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESHAPEFIXTURE_H diff --git a/tests/validation/fixtures/dynamic_fusion/operators/ResizeFixture.h b/tests/validation/fixtures/dynamic_fusion/operators/ResizeFixture.h index c44f0371d0..711767b66f 100644 --- a/tests/validation/fixtures/dynamic_fusion/operators/ResizeFixture.h +++ b/tests/validation/fixtures/dynamic_fusion/operators/ResizeFixture.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2022-2023 Arm Limited. +* Copyright (c) 2022-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESIZEFIXTURE -#define TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESIZEFIXTURE +#ifndef ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESIZEFIXTURE_H +#define ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESIZEFIXTURE_H #include "arm_compute/core/CL/CLKernelLibrary.h" #include "arm_compute/core/TensorInfo.h" @@ -33,12 +33,12 @@ #include "arm_compute/dynamic_fusion/sketch/gpu/operators/GpuOutput.h" #include "tests/CL/CLAccessor.h" -#include "tests/SimpleTensor.h" #include "tests/framework/Fixture.h" #include "tests/framework/Macros.h" -#include "tests/validation/Validation.h" +#include "tests/SimpleTensor.h" #include "tests/validation/reference/Permute.h" #include "tests/validation/reference/Scale.h" +#include "tests/validation/Validation.h" using namespace arm_compute::experimental::dynamic_fusion; @@ -52,9 +52,14 @@ template seed()); std::uniform_real_distribution distribution_float(_min_scale, _max_scale); @@ -93,7 +98,8 @@ protected: auto generate = [&](size_t input_size, float min_output, float max_output) -> int { const float generated_scale = distribution_float(generator); - const int output_size = static_cast(utility::clamp(static_cast(input_size) * generated_scale, min_output, max_output)); + const int output_size = static_cast( + utility::clamp(static_cast(input_size) * generated_scale, min_output, max_output)); return output_size; }; @@ -108,17 +114,17 @@ protected: template void fill(U &&tensor) { - if(tensor.data_type() == DataType::F32) + if (tensor.data_type() == DataType::F32) { std::uniform_real_distribution distribution(-5.0f, 5.0f); library->fill(tensor, distribution, 0); } - else if(tensor.data_type() == DataType::F16) + else if (tensor.data_type() == DataType::F16) { - arm_compute::utils::uniform_real_distribution_16bit distribution{ -5.0f, 5.0f }; + arm_compute::utils::uniform_real_distribution_16bit distribution{-5.0f, 5.0f}; library->fill(tensor, distribution, 0); } - else if(is_data_type_quantized(tensor.data_type())) + else if (is_data_type_quantized(tensor.data_type())) { std::uniform_int_distribution<> distribution(0, 100); library->fill(tensor, distribution, 0); @@ -136,26 +142,30 @@ protected: // Create a new workload sketch CLCompileContext cl_compile_ctx = CLKernelLibrary::get().get_compile_context(); - GpuWorkloadContext context = GpuWorkloadContext{ &cl_compile_ctx }; - GpuWorkloadSketch sketch{ &context }; + GpuWorkloadContext context = GpuWorkloadContext{&cl_compile_ctx}; + GpuWorkloadSketch sketch{&context}; // Create sketch tensors - TensorInfo src_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type, _data_layout)); - src_info.set_quantization_info(_input_quantization_info); - TensorInfo dst_info = context.create_tensor_info(); + ITensorInfo *src_info = context.create_tensor_info(TensorInfo(shape, 1, _data_type, _data_layout)); + src_info->set_quantization_info(_input_quantization_info); + ITensorInfo *dst_info = context.create_tensor_info(); ResizeAttributes attributes; - attributes.align_corners(_align_corners).sampling_policy(_sampling_policy).interpolation_policy(_interpolation_policy).output_width(_output_width).output_height(_output_height); + attributes.align_corners(_align_corners) + .sampling_policy(_sampling_policy) + .interpolation_policy(_interpolation_policy) + .output_width(_output_width) + .output_height(_output_height); - ITensorInfo *scale_result_info = FunctionType::create_op(sketch, &src_info, attributes); - GpuOutput::create_op(sketch, scale_result_info, &dst_info); + ITensorInfo *scale_result_info = FunctionType::create_op(sketch, src_info, attributes); + GpuOutput::create_op(sketch, scale_result_info, dst_info); // Configure runtime ClWorkloadRuntime runtime; runtime.configure(sketch); // (Important) Allocate auxiliary tensor memory if there are any - for(auto &data : runtime.get_auxiliary_tensors()) + for (auto &data : runtime.get_auxiliary_tensors()) { CLTensor *tensor = std::get<0>(data); TensorInfo info = std::get<1>(data); @@ -169,8 +179,8 @@ protected: TensorType t_dst{}; // Initialize user tensors - t_src.allocator()->init(src_info); - t_dst.allocator()->init(dst_info); + t_src.allocator()->init(*src_info); + t_dst.allocator()->init(*dst_info); // Allocate and fill user tensors t_src.allocator()->allocate(); @@ -179,7 +189,7 @@ protected: fill(AccessorType(t_src)); // Run runtime - runtime.run({ &t_src, &t_dst }); + runtime.run({&t_src, &t_dst}); return t_dst; } @@ -187,7 +197,7 @@ protected: SimpleTensor compute_reference(const TensorShape &shape) { // Create reference - SimpleTensor src{ shape, _data_type, 1, _input_quantization_info }; + SimpleTensor src{shape, _data_type, 1, _input_quantization_info}; // Reference code is NCHW, so the input shapes are NCHW const int idx_width = get_data_layout_dimension_index(DataLayout::NCHW, DataLayoutDimension::WIDTH); @@ -199,9 +209,9 @@ protected: // Fill reference fill(src); - return reference::scale(src, scale_x, scale_y, _interpolation_policy, - BorderMode::REPLICATE, static_cast(0), _sampling_policy, /* ceil_policy_scale */ false, - _align_corners, _output_quantization_info); + return reference::scale(src, scale_x, scale_y, _interpolation_policy, BorderMode::REPLICATE, + static_cast(0), _sampling_policy, /* ceil_policy_scale */ false, _align_corners, + _output_quantization_info); } TensorType _target{}; @@ -213,43 +223,45 @@ protected: DataLayout _data_layout{}; QuantizationInfo _input_quantization_info{}; QuantizationInfo _output_quantization_info{}; - bool _align_corners{ false }; - int _output_width{ 0 }; - int _output_height{ 0 }; + bool _align_corners{false}; + int _output_width{0}; + int _output_height{0}; }; template -class DynamicFusionResizeValidationFixture : public DynamicFusionResizeGenericValidationFixture +class DynamicFusionResizeValidationFixture + : public DynamicFusionResizeGenericValidationFixture { public: - void setup(TensorShape shape, DataType data_type, DataLayout data_layout, InterpolationPolicy policy, SamplingPolicy sampling_policy, bool align_corners) + void setup(TensorShape shape, + DataType data_type, + DataLayout data_layout, + InterpolationPolicy policy, + SamplingPolicy sampling_policy, + bool align_corners) { - DynamicFusionResizeGenericValidationFixture::setup(shape, - data_type, - QuantizationInfo(), - data_layout, - policy, - sampling_policy, - align_corners, - QuantizationInfo()); + DynamicFusionResizeGenericValidationFixture::setup( + shape, data_type, QuantizationInfo(), data_layout, policy, sampling_policy, align_corners, + QuantizationInfo()); } }; template -class DynamicFusionResizeQuantizedValidationFixture : public DynamicFusionResizeGenericValidationFixture +class DynamicFusionResizeQuantizedValidationFixture + : public DynamicFusionResizeGenericValidationFixture { public: - void setup(TensorShape shape, DataType data_type, QuantizationInfo quantization_info, DataLayout data_layout, InterpolationPolicy policy, SamplingPolicy sampling_policy, - bool align_corners) + void setup(TensorShape shape, + DataType data_type, + QuantizationInfo quantization_info, + DataLayout data_layout, + InterpolationPolicy policy, + SamplingPolicy sampling_policy, + bool align_corners) { - DynamicFusionResizeGenericValidationFixture::setup(shape, - data_type, - quantization_info, - data_layout, - policy, - sampling_policy, - align_corners, - quantization_info); + DynamicFusionResizeGenericValidationFixture::setup( + shape, data_type, quantization_info, data_layout, policy, sampling_policy, align_corners, + quantization_info); } }; @@ -257,4 +269,4 @@ public: } // namespace test } // namespace arm_compute -#endif /* TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESIZEFIXTURE */ +#endif // ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_RESIZEFIXTURE_H diff --git a/tests/validation/fixtures/dynamic_fusion/operators/SoftmaxFixture.h b/tests/validation/fixtures/dynamic_fusion/operators/SoftmaxFixture.h index 1ed133d2ef..175d4ff889 100644 --- a/tests/validation/fixtures/dynamic_fusion/operators/SoftmaxFixture.h +++ b/tests/validation/fixtures/dynamic_fusion/operators/SoftmaxFixture.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Arm Limited. +* Copyright (c) 2023-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,18 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_SOFTMAXFIXTURE -#define TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_SOFTMAXFIXTURE +#ifndef ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_SOFTMAXFIXTURE_H +#define ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_SOFTMAXFIXTURE_H #include "arm_compute/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.h" #include "arm_compute/dynamic_fusion/sketch/attributes/SoftmaxAttributes.h" #include "arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h" -#include "tests/SimpleTensor.h" #include "tests/framework/Fixture.h" #include "tests/framework/Macros.h" -#include "tests/validation/Validation.h" +#include "tests/SimpleTensor.h" #include "tests/validation/reference/SoftmaxLayer.h" +#include "tests/validation/Validation.h" using namespace arm_compute::experimental::dynamic_fusion; @@ -56,17 +56,17 @@ protected: template void fill(U &&tensor) { - if(tensor.data_type() == DataType::F32) + if (tensor.data_type() == DataType::F32) { std::uniform_real_distribution distribution(-10.0f, 10.0f); library->fill(tensor, distribution, 0); } - else if(tensor.data_type() == DataType::F16) + else if (tensor.data_type() == DataType::F16) { - arm_compute::utils::uniform_real_distribution_16bit distribution{ -10.0f, 10.0f }; + arm_compute::utils::uniform_real_distribution_16bit distribution{-10.0f, 10.0f}; library->fill(tensor, distribution, 0); } - else if(!is_data_type_quantized(tensor.data_type())) + else if (!is_data_type_quantized(tensor.data_type())) { std::uniform_int_distribution<> distribution(0, 100); library->fill(tensor, distribution, 0); @@ -81,14 +81,14 @@ protected: { // Create a new workload sketch CLCompileContext cl_compile_ctx = CLKernelLibrary::get().get_compile_context(); - GpuWorkloadContext context = GpuWorkloadContext{ &cl_compile_ctx }; - GpuWorkloadSketch sketch{ &context }; + GpuWorkloadContext context = GpuWorkloadContext{&cl_compile_ctx}; + GpuWorkloadSketch sketch{&context}; SoftmaxAttributes softmax_attr{}; softmax_attr.axis(axis).beta(beta).is_log_softmax(is_log); - TensorInfo src_info = context.create_tensor_info(shape, 1, data_type); - TensorInfo dst_info = context.create_tensor_info(shape, 1, data_type); - FunctionType::create_op(sketch, &src_info, &dst_info, softmax_attr); + ITensorInfo *src_info = context.create_tensor_info(shape, 1, data_type); + ITensorInfo *dst_info = context.create_tensor_info(shape, 1, data_type); + FunctionType::create_op(sketch, src_info, dst_info, softmax_attr); // Configure runtime ClWorkloadRuntime runtime; @@ -96,7 +96,7 @@ protected: // (Important) Allocate auxiliary tensor memory if there are any // Instead of using ACL allocated memory, the user can choose to import memory into the tensors - for(auto &data : runtime.get_auxiliary_tensors()) + for (auto &data : runtime.get_auxiliary_tensors()) { CLTensor *tensor = std::get<0>(data); TensorInfo info = std::get<1>(data); @@ -109,8 +109,8 @@ protected: TensorType dst{}; // Initialize user tensors - src.allocator()->init(src_info); - dst.allocator()->init(dst_info); + src.allocator()->init(*src_info); + dst.allocator()->init(*dst_info); // Allocate and fill user tensors src.allocator()->allocate(); @@ -118,15 +118,16 @@ protected: fill(AccessorType(src)); // Run runtime - runtime.run({ &src, &dst }); + runtime.run({&src, &dst}); return dst; } - SimpleTensor compute_reference(const TensorShape &shape, DataType data_type, float beta, int32_t axis, bool is_log) + SimpleTensor + compute_reference(const TensorShape &shape, DataType data_type, float beta, int32_t axis, bool is_log) { // Create reference - SimpleTensor src{ shape, data_type, 1 }; + SimpleTensor src{shape, data_type, 1}; // Fill reference fill(src); @@ -139,16 +140,14 @@ protected: }; template -class DynamicFusionSoftmaxValidationFixture : public DynamicFusionSoftmaxValidationGenericFixture +class DynamicFusionSoftmaxValidationFixture + : public DynamicFusionSoftmaxValidationGenericFixture { public: void setup(TensorShape shape, DataType data_type, float beta, size_t axis, bool is_log) { - DynamicFusionSoftmaxValidationGenericFixture::setup(shape, - data_type, - beta, - axis, - is_log); + DynamicFusionSoftmaxValidationGenericFixture::setup( + shape, data_type, beta, axis, is_log); } }; @@ -156,4 +155,4 @@ public: } // namespace test } // namespace arm_compute -#endif /* TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_SOFTMAXFIXTURE */ +#endif // ACL_TESTS_VALIDATION_FIXTURES_DYNAMIC_FUSION_OPERATORS_SOFTMAXFIXTURE_H -- cgit v1.2.1