From afd38f0c617d6f89b2b4532c6c44f116617e2b6f Mon Sep 17 00:00:00 2001 From: Felix Thomasmathibalan Date: Wed, 27 Sep 2023 17:46:17 +0100 Subject: Apply clang-format on repository Code is formatted as per a revised clang format configuration file(not part of this delivery). Version 14.0.6 is used. Exclusion List: - files with .cl extension - files that are not strictly C/C++ (e.g. Android.bp, Sconscript ...) And the following directories - compute_kernel_writer/validation/ - tests/ - include/ - src/core/NEON/kernels/convolution/ - src/core/NEON/kernels/arm_gemm/ - src/core/NEON/kernels/arm_conv/ - data/ There will be a follow up for formatting of .cl files and the files under tests/ and compute_kernel_writer/validation/. Signed-off-by: Felix Thomasmathibalan Change-Id: Ib7eb1fcf4e7537b9feaefcfc15098a804a3fde0a Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10391 Benchmark: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Gunes Bayir --- src/graph/backends/CL/CLFunctionsFactory.cpp | 151 ++++++++++++++++----------- 1 file changed, 90 insertions(+), 61 deletions(-) (limited to 'src/graph/backends/CL/CLFunctionsFactory.cpp') diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 882810474e..d4e1aa880f 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -22,12 +22,12 @@ * SOFTWARE. */ #include "arm_compute/graph/backends/CL/CLFunctionFactory.h" - +#include "arm_compute/graph/backends/FunctionHelpers.h" #include "arm_compute/graph/Graph.h" #include "arm_compute/graph/GraphContext.h" -#include "arm_compute/graph/backends/FunctionHelpers.h" #include "arm_compute/runtime/CL/CLFunctions.h" #include "arm_compute/runtime/CPP/CPPFunctions.h" + #include "src/core/CL/CLKernels.h" #include "support/Cast.h" @@ -89,20 +89,19 @@ class CPPWrapperFunction : public IFunction { public: /* Default constructor */ - CPPWrapperFunction() - : _tensors(), _func(nullptr) + CPPWrapperFunction() : _tensors(), _func(nullptr) { } void run() override { - for(auto &tensor : _tensors) + for (auto &tensor : _tensors) { tensor->map(CLScheduler::get().queue()); } _func->run(); - for(auto &tensor : _tensors) + for (auto &tensor : _tensors) { tensor->unmap(CLScheduler::get().queue()); } @@ -127,7 +126,8 @@ namespace detail { // Specialized functions template <> -std::unique_ptr create_detection_output_layer(DetectionOutputLayerNode &node) +std::unique_ptr +create_detection_output_layer(DetectionOutputLayerNode &node) { validate_node(node, 3 /* expected inputs */, 1 /* expected outputs */); @@ -149,16 +149,12 @@ std::unique_ptr create_detection_output_layerinfo()->data_type() - << " Input0 shape: " << input0->info()->tensor_shape() - << " Input1 shape: " << input1->info()->tensor_shape() + << node.name() << " Type: " << node.type() << " Target: " << CLTargetInfo::TargetType + << " Data Type: " << input0->info()->data_type() << " Input0 shape: " + << input0->info()->tensor_shape() << " Input1 shape: " << input1->info()->tensor_shape() << " Input2 shape: " << input2->info()->tensor_shape() << " Output shape: " << output->info()->tensor_shape() - << " DetectionOutputLayer info: " << detect_info - << std::endl); + << " DetectionOutputLayer info: " << detect_info << std::endl); auto wrap_function = std::make_unique(); @@ -171,7 +167,8 @@ std::unique_ptr create_detection_output_layer -std::unique_ptr create_detection_post_process_layer(DetectionPostProcessLayerNode &node) +std::unique_ptr +create_detection_post_process_layer(DetectionPostProcessLayerNode &node) { validate_node(node, 3 /* expected inputs */, 4 /* expected outputs */); @@ -199,19 +196,15 @@ std::unique_ptr create_detection_post_process_layerinfo()->data_type() - << " Input0 shape: " << input0->info()->tensor_shape() - << " Input1 shape: " << input1->info()->tensor_shape() + << node.name() << " Type: " << node.type() << " Target: " << CLTargetInfo::TargetType + << " Data Type: " << input0->info()->data_type() << " Input0 shape: " + << input0->info()->tensor_shape() << " Input1 shape: " << input1->info()->tensor_shape() << " Input2 shape: " << input2->info()->tensor_shape() << " Output0 shape: " << output0->info()->tensor_shape() << " Output1 shape: " << output1->info()->tensor_shape() << " Output2 shape: " << output2->info()->tensor_shape() << " Output3 shape: " << output3->info()->tensor_shape() - << " DetectionPostProcessLayer info: " << detect_info - << std::endl); + << " DetectionPostProcessLayer info: " << detect_info << std::endl); auto wrap_function = std::make_unique(); @@ -230,92 +223,128 @@ std::unique_ptr create_detection_post_process_layer CLFunctionFactory::create(INode *node, GraphContext &ctx) { - if(node == nullptr) + if (node == nullptr) { return nullptr; } NodeType type = node->type(); - switch(type) + switch (type) { case NodeType::ActivationLayer: - return detail::create_activation_layer(*polymorphic_downcast(node)); + return detail::create_activation_layer( + *polymorphic_downcast(node)); case NodeType::ArgMinMaxLayer: - return detail::create_arg_min_max_layer(*polymorphic_downcast(node)); + return detail::create_arg_min_max_layer( + *polymorphic_downcast(node)); case NodeType::BatchNormalizationLayer: - return detail::create_batch_normalization_layer(*polymorphic_downcast(node)); + return detail::create_batch_normalization_layer( + *polymorphic_downcast(node)); case NodeType::BoundingBoxTransformLayer: - return detail::create_bounding_box_transform_layer(*polymorphic_downcast(node)); + return detail::create_bounding_box_transform_layer( + *polymorphic_downcast(node)); case NodeType::ChannelShuffleLayer: - return detail::create_channel_shuffle_layer(*polymorphic_downcast(node)); + return detail::create_channel_shuffle_layer( + *polymorphic_downcast(node)); case NodeType::ConvolutionLayer: - return detail::create_convolution_layer(*polymorphic_downcast(node), ctx); + return detail::create_convolution_layer( + *polymorphic_downcast(node), ctx); case NodeType::DeconvolutionLayer: - return detail::create_deconvolution_layer(*polymorphic_downcast(node), ctx); + return detail::create_deconvolution_layer( + *polymorphic_downcast(node), ctx); case NodeType::ConcatenateLayer: - return detail::create_concatenate_layer(*polymorphic_downcast(node)); + return detail::create_concatenate_layer( + *polymorphic_downcast(node)); case NodeType::DepthToSpaceLayer: - return detail::create_depth_to_space_layer(*polymorphic_downcast(node)); + return detail::create_depth_to_space_layer( + *polymorphic_downcast(node)); case NodeType::DepthwiseConvolutionLayer: - return detail::create_depthwise_convolution_layer(*polymorphic_downcast(node)); + return detail::create_depthwise_convolution_layer( + *polymorphic_downcast(node)); case NodeType::DequantizationLayer: - return detail::create_dequantization_layer(*polymorphic_downcast(node)); + return detail::create_dequantization_layer( + *polymorphic_downcast(node)); case NodeType::DetectionOutputLayer: - return detail::create_detection_output_layer(*polymorphic_downcast(node)); + return detail::create_detection_output_layer( + *polymorphic_downcast(node)); case NodeType::DetectionPostProcessLayer: - return detail::create_detection_post_process_layer(*polymorphic_downcast(node)); + return detail::create_detection_post_process_layer( + *polymorphic_downcast(node)); case NodeType::EltwiseLayer: - return detail::create_eltwise_layer(*polymorphic_downcast(node)); + return detail::create_eltwise_layer( + *polymorphic_downcast(node)); case NodeType::UnaryEltwiseLayer: - return detail::create_unary_eltwise_layer(*polymorphic_downcast(node)); + return detail::create_unary_eltwise_layer( + *polymorphic_downcast(node)); case NodeType::FlattenLayer: - return detail::create_flatten_layer(*polymorphic_downcast(node)); + return detail::create_flatten_layer( + *polymorphic_downcast(node)); case NodeType::FullyConnectedLayer: - return detail::create_fully_connected_layer(*polymorphic_downcast(node), ctx); + return detail::create_fully_connected_layer( + *polymorphic_downcast(node), ctx); case NodeType::FusedConvolutionBatchNormalizationLayer: - return detail::create_fused_convolution_batch_normalization_layer(*polymorphic_downcast(node), ctx); + return detail::create_fused_convolution_batch_normalization_layer( + *polymorphic_downcast(node), ctx); case NodeType::FusedDepthwiseConvolutionBatchNormalizationLayer: - return detail::create_fused_depthwise_convolution_batch_normalization_layer(*polymorphic_downcast(node), ctx); + return detail::create_fused_depthwise_convolution_batch_normalization_layer( + *polymorphic_downcast(node), ctx); case NodeType::GenerateProposalsLayer: - return detail::create_generate_proposals_layer(*polymorphic_downcast(node), ctx); + return detail::create_generate_proposals_layer( + *polymorphic_downcast(node), ctx); case NodeType::L2NormalizeLayer: - return detail::create_l2_normalize_layer(*polymorphic_downcast(node), ctx); + return detail::create_l2_normalize_layer( + *polymorphic_downcast(node), ctx); case NodeType::NormalizationLayer: - return detail::create_normalization_layer(*polymorphic_downcast(node), ctx); + return detail::create_normalization_layer( + *polymorphic_downcast(node), ctx); case NodeType::NormalizePlanarYUVLayer: - return detail::create_normalize_planar_yuv_layer(*polymorphic_downcast(node)); + return detail::create_normalize_planar_yuv_layer( + *polymorphic_downcast(node)); case NodeType::PadLayer: return detail::create_pad_layer(*polymorphic_downcast(node)); case NodeType::PermuteLayer: - return detail::create_permute_layer(*polymorphic_downcast(node)); + return detail::create_permute_layer( + *polymorphic_downcast(node)); case NodeType::PoolingLayer: - return detail::create_pooling_layer(*polymorphic_downcast(node)); + return detail::create_pooling_layer( + *polymorphic_downcast(node)); case NodeType::PReluLayer: - return detail::create_prelu_layer(*polymorphic_downcast(node)); + return detail::create_prelu_layer( + *polymorphic_downcast(node)); case NodeType::PrintLayer: return detail::create_print_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: - return detail::create_priorbox_layer(*polymorphic_downcast(node)); + return detail::create_priorbox_layer( + *polymorphic_downcast(node)); case NodeType::QuantizationLayer: - return detail::create_quantization_layer(*polymorphic_downcast(node)); + return detail::create_quantization_layer( + *polymorphic_downcast(node)); case NodeType::ReductionOperationLayer: - return detail::create_reduction_operation_layer(*polymorphic_downcast(node), ctx); + return detail::create_reduction_operation_layer( + *polymorphic_downcast(node), ctx); case NodeType::ReorgLayer: - return detail::create_reorg_layer(*polymorphic_downcast(node)); + return detail::create_reorg_layer( + *polymorphic_downcast(node)); case NodeType::ReshapeLayer: - return detail::create_reshape_layer(*polymorphic_downcast(node)); + return detail::create_reshape_layer( + *polymorphic_downcast(node)); case NodeType::ResizeLayer: return detail::create_resize_layer(*polymorphic_downcast(node)); case NodeType::ROIAlignLayer: - return detail::create_roi_align_layer(*polymorphic_downcast(node)); + return detail::create_roi_align_layer( + *polymorphic_downcast(node)); case NodeType::SliceLayer: return detail::create_slice_layer(*polymorphic_downcast(node)); case NodeType::SoftmaxLayer: - return detail::create_softmax_layer(*polymorphic_downcast(node), ctx); + return detail::create_softmax_layer( + *polymorphic_downcast(node), ctx); case NodeType::StackLayer: - return detail::create_stack_layer(*polymorphic_downcast(node)); + return detail::create_stack_layer( + *polymorphic_downcast(node)); case NodeType::StridedSliceLayer: - return detail::create_strided_slice_layer(*polymorphic_downcast(node)); + return detail::create_strided_slice_layer( + *polymorphic_downcast(node)); default: return nullptr; } -- cgit v1.2.1