diff options
| author | Giorgio Arena <giorgio.arena@arm.com> | 2020-02-11 17:21:31 +0000 |
|---|---|---|
| committer | SiCong Li <sicong.li@arm.com> | 2020-04-03 08:51:12 +0000 |
| commit | 8b2a7d3aa119e7f1d6a03690d05eb27c5d178b9f (patch) | |
| tree | 9fb4f4f328f7a17de13bef109834e8ad8a21d2ee /arm_compute/graph/backends/FunctionHelpers.h | |
| parent | 15e4d876643c37e1db36ee1190ec52319479ffaf (diff) | |
| download | ComputeLibrary-8b2a7d3aa119e7f1d6a03690d05eb27c5d178b9f.tar.gz | |
COMPMID-3101 Fuse activation with floating point elementwise operation layers in CL
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Change-Id: I1693f8664ba7c0dc8c076bbe7365cef1e667bd25
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2718
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/graph/backends/FunctionHelpers.h')
| -rw-r--r-- | arm_compute/graph/backends/FunctionHelpers.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 44b24b58bf..382b18a888 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -773,6 +773,7 @@ std::unique_ptr<IFunction> create_eltwise_layer(EltwiseLayerNode &node) typename TargetInfo::TensorType *output = get_backing_tensor<TargetInfo>(node.output(0)); const EltwiseOperation eltwise_op = node.eltwise_operation(); const ConvertPolicy convert_policy = node.convert_policy(); + const ActivationLayerInfo act_info = node.fused_activation(); ARM_COMPUTE_ERROR_ON(input1 == nullptr); ARM_COMPUTE_ERROR_ON(input2 == nullptr); ARM_COMPUTE_ERROR_ON(output == nullptr); @@ -783,19 +784,19 @@ std::unique_ptr<IFunction> create_eltwise_layer(EltwiseLayerNode &node) { std::tie(func, func_name) = create_named_function<typename EltwiseFunctions::Addition>( std::string("ArithmeticAddition"), - input1, input2, output, convert_policy); + input1, input2, output, convert_policy, act_info); } else if(eltwise_op == EltwiseOperation::Sub) { std::tie(func, func_name) = create_named_function<typename EltwiseFunctions::Subtraction>( std::string("ArithmeticSubtraction"), - input1, input2, output, convert_policy); + input1, input2, output, convert_policy, act_info); } else if(eltwise_op == EltwiseOperation::Mul) { std::tie(func, func_name) = create_named_function<typename EltwiseFunctions::Multiplication>( std::string("PixelWiseMultiplication"), - input1, input2, output, 1.f, convert_policy, node.rounding_policy()); + input1, input2, output, 1.f, convert_policy, node.rounding_policy(), act_info); } else { |