diff options
Diffstat (limited to 'src/graph')
-rw-r--r-- | src/graph/TypeLoader.cpp | 1 | ||||
-rw-r--r-- | src/graph/backends/CL/CLFunctionsFactory.cpp | 9 | ||||
-rw-r--r-- | src/graph/backends/CL/CLNodeValidator.cpp | 3 | ||||
-rw-r--r-- | src/graph/backends/GLES/GCNodeValidator.cpp | 1 | ||||
-rw-r--r-- | src/graph/backends/NEON/NEFunctionFactory.cpp | 9 | ||||
-rw-r--r-- | src/graph/backends/NEON/NENodeValidator.cpp | 3 |
6 files changed, 4 insertions, 22 deletions
diff --git a/src/graph/TypeLoader.cpp b/src/graph/TypeLoader.cpp index b63672b39b..81a405b961 100644 --- a/src/graph/TypeLoader.cpp +++ b/src/graph/TypeLoader.cpp @@ -131,7 +131,6 @@ DepthwiseConvolutionMethod depthwise_convolution_method_from_name(const std::str static const std::map<std::string, DepthwiseConvolutionMethod> methods = { { "default", DepthwiseConvolutionMethod::Default }, - { "gemv", DepthwiseConvolutionMethod::GEMV }, { "optimized3x3", DepthwiseConvolutionMethod::Optimized3x3 }, }; diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 6d231f2ef3..d53b634bb1 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -56,13 +56,6 @@ struct CLConvolutionLayerFunctions using WinogradConvolutionLayer = CLWinogradConvolutionLayer; }; -/** Collection of CL depthwise convolution functions */ -struct CLDepthwiseConvolutionLayerFunctions -{ - using GenericDepthwiseConvolutionLayer = CLDepthwiseConvolutionLayer; - using OptimizedDepthwiseConvolutionLayer = CLDepthwiseConvolutionLayer; -}; - /** Collection of CL element-wise functions */ struct CLEltwiseFunctions { @@ -249,7 +242,7 @@ std::unique_ptr<IFunction> CLFunctionFactory::create(INode *node, GraphContext & case NodeType::ConcatenateLayer: return detail::create_concatenate_layer<CLConcatenateLayer, CLTargetInfo>(*polymorphic_downcast<ConcatenateLayerNode *>(node)); case NodeType::DepthwiseConvolutionLayer: - return detail::create_depthwise_convolution_layer<CLDepthwiseConvolutionLayerFunctions, CLTargetInfo>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); + return detail::create_depthwise_convolution_layer<CLDepthwiseConvolutionLayer, CLTargetInfo>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); case NodeType::DetectionOutputLayer: return detail::create_detection_output_layer<CPPDetectionOutputLayer, CLTargetInfo>(*polymorphic_downcast<DetectionOutputLayerNode *>(node)); case NodeType::DetectionPostProcessLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index 40ec508767..a2786187a2 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -58,8 +58,7 @@ Status CLNodeValidator::validate(INode *node) CLGEMMConvolutionLayer, CLWinogradConvolutionLayer>(*polymorphic_downcast<ConvolutionLayerNode *>(node)); case NodeType::DepthwiseConvolutionLayer: - return detail::validate_depthwise_convolution_layer<CLDepthwiseConvolutionLayer, - CLDepthwiseConvolutionLayer3x3>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); + return detail::validate_depthwise_convolution_layer<CLDepthwiseConvolutionLayer>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); case NodeType::DetectionOutputLayer: return detail::validate_detection_output_layer<CPPDetectionOutputLayer>(*polymorphic_downcast<DetectionOutputLayerNode *>(node)); case NodeType::DetectionPostProcessLayer: diff --git a/src/graph/backends/GLES/GCNodeValidator.cpp b/src/graph/backends/GLES/GCNodeValidator.cpp index 9cbb9a12ef..9d848ab3b1 100644 --- a/src/graph/backends/GLES/GCNodeValidator.cpp +++ b/src/graph/backends/GLES/GCNodeValidator.cpp @@ -58,7 +58,6 @@ Status validate_depthwise_convolution_layer(DepthwiseConvolutionLayerNode &node) // TODO (geopin01) : Switch when validation is implemented // Validate function ARM_COMPUTE_RETURN_ERROR_ON_MSG(weights->tensor_shape().x() != 3 && weights->tensor_shape().y() != 3, "Unsupported depthwise convolution"); - node.set_depthwise_convolution_method(DepthwiseConvolutionMethod::Optimized3x3); return Status{}; } diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 45e9727133..d8b0ae92ea 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -62,13 +62,6 @@ struct NEConvolutionLayerFunctions using WinogradConvolutionLayer = NEWinogradConvolutionLayer; }; -/** Collection of CL depthwise convolution functions */ -struct NEDepthwiseConvolutionLayerFunctions -{ - using GenericDepthwiseConvolutionLayer = NEDepthwiseConvolutionLayer; - using OptimizedDepthwiseConvolutionLayer = NEDepthwiseConvolutionLayerOptimized; -}; - /** Collection of CL element-wise functions */ struct NEEltwiseFunctions { @@ -213,7 +206,7 @@ std::unique_ptr<IFunction> NEFunctionFactory::create(INode *node, GraphContext & case NodeType::ConcatenateLayer: return detail::create_concatenate_layer<NEConcatenateLayer, NETargetInfo>(*polymorphic_downcast<ConcatenateLayerNode *>(node)); case NodeType::DepthwiseConvolutionLayer: - return detail::create_depthwise_convolution_layer<NEDepthwiseConvolutionLayerFunctions, NETargetInfo>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); + return detail::create_depthwise_convolution_layer<NEDepthwiseConvolutionLayer, NETargetInfo>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); case NodeType::DetectionOutputLayer: return detail::create_detection_output_layer<CPPDetectionOutputLayer, NETargetInfo>(*polymorphic_downcast<DetectionOutputLayerNode *>(node)); case NodeType::DetectionPostProcessLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index 734b3401f7..0b53657c42 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -58,8 +58,7 @@ Status NENodeValidator::validate(INode *node) NEGEMMConvolutionLayer, NEWinogradConvolutionLayer>(*polymorphic_downcast<ConvolutionLayerNode *>(node)); case NodeType::DepthwiseConvolutionLayer: - return detail::validate_depthwise_convolution_layer<NEDepthwiseConvolutionLayer, - NEDepthwiseConvolutionLayer3x3>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); + return detail::validate_depthwise_convolution_layer<NEDepthwiseConvolutionLayer>(*polymorphic_downcast<DepthwiseConvolutionLayerNode *>(node)); case NodeType::DetectionOutputLayer: return detail::validate_detection_output_layer<CPPDetectionOutputLayer>(*polymorphic_downcast<DetectionOutputLayerNode *>(node)); case NodeType::DetectionPostProcessLayer: |