From 287051663030ccd945accdcd90905fb48bf30948 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 21 Mar 2018 20:10:53 +0000 Subject: COMPMID-1007: Add initial validate support to backend Change-Id: I55eae35f35a3c7891e8d535907c861f022e43bea Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/125470 Tested-by: Jenkins Reviewed-by: Gian Marco Iodice --- src/graph2/backends/NEON/NEDeviceBackend.cpp | 7 +-- src/graph2/backends/NEON/NENodeValidator.cpp | 65 ++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 src/graph2/backends/NEON/NENodeValidator.cpp (limited to 'src/graph2/backends/NEON') diff --git a/src/graph2/backends/NEON/NEDeviceBackend.cpp b/src/graph2/backends/NEON/NEDeviceBackend.cpp index 9f24498abd..5569abf41b 100644 --- a/src/graph2/backends/NEON/NEDeviceBackend.cpp +++ b/src/graph2/backends/NEON/NEDeviceBackend.cpp @@ -30,6 +30,7 @@ #include "arm_compute/graph2/Tensor.h" #include "arm_compute/graph2/backends/BackendRegistrar.h" #include "arm_compute/graph2/backends/NEON/NEFunctionFactory.h" +#include "arm_compute/graph2/backends/NEON/NENodeValidator.h" #include "arm_compute/graph2/backends/NEON/NESubTensorHandle.h" #include "arm_compute/graph2/backends/NEON/NETensorHandle.h" @@ -104,12 +105,12 @@ std::unique_ptr NEDeviceBackend::configure_node(INode &n return NEFunctionFactory::create(&node, ctx); } -arm_compute::Status NEDeviceBackend::validate_node(const INode &node) +arm_compute::Status NEDeviceBackend::validate_node(INode &node) { ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating NEON node with ID : " << node.id() << std::endl); - ARM_COMPUTE_UNUSED(node); + ARM_COMPUTE_ERROR_ON(node.assigned_target() != Target::NEON); - return Status{}; + return NENodeValidator::validate(&node); } std::shared_ptr NEDeviceBackend::create_memory_manager(MemoryManagerAffinity affinity) diff --git a/src/graph2/backends/NEON/NENodeValidator.cpp b/src/graph2/backends/NEON/NENodeValidator.cpp new file mode 100644 index 0000000000..4620f4cd87 --- /dev/null +++ b/src/graph2/backends/NEON/NENodeValidator.cpp @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/graph2/backends/NEON/NENodeValidator.h" + +#include "arm_compute/graph2/backends/ValidateHelpers.h" +#include "arm_compute/graph2/nodes/Nodes.h" + +#include "arm_compute/core/utils/misc/Cast.h" +#include "arm_compute/runtime/NEON/NEFunctions.h" + +using namespace arm_compute::utils::cast; + +namespace arm_compute +{ +namespace graph2 +{ +namespace backends +{ +Status NENodeValidator::validate(INode *node) +{ + if(node == nullptr) + { + return Status{}; + } + + NodeType type = node->type(); + switch(type) + { + case NodeType::ConvolutionLayer: + return detail::validate_convolution_layer(*polymorphic_downcast(node)); + case NodeType::DepthwiseConvolutionLayer: + return detail::validate_depthwise_convolution_layer(*polymorphic_downcast(node)); + + default: + return Status{}; + } +} +} // namespace backends +} // namespace graph2 +} // namespace arm_compute \ No newline at end of file -- cgit v1.2.1