From 579ca84bd8ef5a91eded65c4dc5e0b9f7de8bef1 Mon Sep 17 00:00:00 2001 From: SiCongLi Date: Mon, 18 Oct 2021 09:38:33 +0100 Subject: Add PostOp support to GEMM and CLGEMM operators and functions Part 2 * Implement PostOp interface changes * Remove spaces around "=" in TypePrinter Partially resolves COMPMID-4435 Signed-off-by: SiCongLi Change-Id: If1e2280554030a0f635e73339a2e86987f6dc41b Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6484 Tested-by: Arm Jenkins Reviewed-by: Sheri Zhang Comments-Addressed: Arm Jenkins --- arm_compute/runtime/FunctionDescriptors.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'arm_compute/runtime/FunctionDescriptors.h') diff --git a/arm_compute/runtime/FunctionDescriptors.h b/arm_compute/runtime/FunctionDescriptors.h index 07a8f6600e..face8a6fb4 100644 --- a/arm_compute/runtime/FunctionDescriptors.h +++ b/arm_compute/runtime/FunctionDescriptors.h @@ -57,20 +57,22 @@ struct Conv2dInfo { Conv2dInfo() = default; - Conv2dInfo(const PadStrideInfo &conv_info, - const Size2D &dilation, - const ActivationLayerInfo &act_info, - bool enable_fast_math, - unsigned int num_groups) - : conv_info(conv_info), dilation(dilation), act_info(act_info), enable_fast_math(enable_fast_math), num_groups(num_groups) + Conv2dInfo(const PadStrideInfo &conv_info, + const Size2D &dilation, + const ActivationLayerInfo &act_info, + bool enable_fast_math, + unsigned int num_groups, + const experimental::PostOpList &post_ops = experimental::PostOpList {}) + : conv_info(conv_info), dilation(dilation), act_info(act_info), enable_fast_math(enable_fast_math), num_groups(num_groups), post_ops(post_ops) { } - PadStrideInfo conv_info{}; - Size2D dilation{ 1U, 1U }; - ActivationLayerInfo act_info{}; - bool enable_fast_math{ false }; - unsigned int num_groups{ 1 }; + PadStrideInfo conv_info{}; + Size2D dilation{ 1U, 1U }; + ActivationLayerInfo act_info{}; + bool enable_fast_math{ false }; + unsigned int num_groups{ 1 }; + experimental::PostOpList post_ops{}; }; /** Descriptor used by the 3d Convolution function */ -- cgit v1.2.1