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 --- tests/validation/dynamic_fusion/gpu/cl/Sigmoid.cpp | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'tests/validation/dynamic_fusion/gpu/cl/Sigmoid.cpp') diff --git a/tests/validation/dynamic_fusion/gpu/cl/Sigmoid.cpp b/tests/validation/dynamic_fusion/gpu/cl/Sigmoid.cpp index e995511171..0134a7c11b 100644 --- a/tests/validation/dynamic_fusion/gpu/cl/Sigmoid.cpp +++ b/tests/validation/dynamic_fusion/gpu/cl/Sigmoid.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Arm Limited. + * Copyright (c) 2023-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -29,10 +29,10 @@ #include "tests/CL/CLAccessor.h" #include "tests/datasets/ShapeDatasets.h" #include "tests/framework/Asserts.h" -#include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" -#include "tests/validation/Validation.h" +#include "tests/framework/Macros.h" #include "tests/validation/fixtures/dynamic_fusion/operators/ActivationFixture.h" +#include "tests/validation/Validation.h" namespace arm_compute { @@ -65,9 +65,9 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip( GpuWorkloadSketch sketch{ &context }; // Fuse sigmoid - const TensorInfo src_info = context.create_tensor_info(input_info); + const ITensorInfo *src_info = context.create_tensor_info(input_info); - const bool res = static_cast(GpuSigmoid::validate_op(sketch, &src_info)); + const bool res = static_cast(GpuSigmoid::validate_op(sketch, src_info)); ARM_COMPUTE_EXPECT(res == expected, framework::LogLevel::ERRORS); } // clang-format on @@ -81,8 +81,7 @@ TEST_SUITE(FP16) FIXTURE_DATA_TEST_CASE(RunSmallOneOp, DynamicFusionSigmoidOpFixture, framework::DatasetMode::ALL, - combine(combine(datasets::SmallShapes(), - framework::dataset::make("Fuse", { false })), + combine(combine(datasets::SmallShapes(), framework::dataset::make("Fuse", {false})), framework::dataset::make("DataType", DataType::F16))) { // Validate output @@ -92,8 +91,7 @@ FIXTURE_DATA_TEST_CASE(RunSmallOneOp, FIXTURE_DATA_TEST_CASE(RunSmall5dOneOp, DynamicFusionSigmoidOpFixture, framework::DatasetMode::ALL, - combine(combine(datasets::Small5dShapes(), - framework::dataset::make("Fuse", { false })), + combine(combine(datasets::Small5dShapes(), framework::dataset::make("Fuse", {false})), framework::dataset::make("DataType", DataType::F16))) { // Validate output @@ -104,8 +102,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall5dOneOp, FIXTURE_DATA_TEST_CASE(RunSmallTwoOps, DynamicFusionSigmoidOpFixture, framework::DatasetMode::ALL, - combine(combine(datasets::SmallShapes(), - framework::dataset::make("Fuse", { true })), + combine(combine(datasets::SmallShapes(), framework::dataset::make("Fuse", {true})), framework::dataset::make("DataType", DataType::F16))) { // Validate output @@ -118,8 +115,7 @@ TEST_SUITE(FP32) FIXTURE_DATA_TEST_CASE(RunSmallOneOp, DynamicFusionSigmoidOpFixture, framework::DatasetMode::ALL, - combine(combine(datasets::SmallShapes(), - framework::dataset::make("Fuse", { false })), + combine(combine(datasets::SmallShapes(), framework::dataset::make("Fuse", {false})), framework::dataset::make("DataType", DataType::F32))) { // Validate output @@ -129,8 +125,7 @@ FIXTURE_DATA_TEST_CASE(RunSmallOneOp, FIXTURE_DATA_TEST_CASE(RunSmall5dOneOp, DynamicFusionSigmoidOpFixture, framework::DatasetMode::ALL, - combine(combine(datasets::Small5dShapes(), - framework::dataset::make("Fuse", { false })), + combine(combine(datasets::Small5dShapes(), framework::dataset::make("Fuse", {false})), framework::dataset::make("DataType", DataType::F32))) { // Validate output @@ -141,8 +136,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall5dOneOp, FIXTURE_DATA_TEST_CASE(RunSmallTwoOps, DynamicFusionSigmoidOpFixture, framework::DatasetMode::ALL, - combine(combine(datasets::SmallShapes(), - framework::dataset::make("Fuse", { true })), + combine(combine(datasets::SmallShapes(), framework::dataset::make("Fuse", {true})), framework::dataset::make("DataType", DataType::F32))) { // Validate output -- cgit v1.2.1