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/GraphManager.cpp | 3 ++ src/graph2/backends/CL/CLDeviceBackend.cpp | 8 ++-- src/graph2/backends/CL/CLNodeValidator.cpp | 64 +++++++++++++++++++++++++++ src/graph2/backends/NEON/NEDeviceBackend.cpp | 7 +-- src/graph2/backends/NEON/NENodeValidator.cpp | 65 ++++++++++++++++++++++++++++ src/graph2/detail/ExecutionHelpers.cpp | 17 ++++++++ 6 files changed, 157 insertions(+), 7 deletions(-) create mode 100644 src/graph2/backends/CL/CLNodeValidator.cpp create mode 100644 src/graph2/backends/NEON/NENodeValidator.cpp (limited to 'src') diff --git a/src/graph2/GraphManager.cpp b/src/graph2/GraphManager.cpp index edbe2cc381..e708dc6a61 100644 --- a/src/graph2/GraphManager.cpp +++ b/src/graph2/GraphManager.cpp @@ -64,6 +64,9 @@ void GraphManager::finalize_graph(Graph &graph, GraphContext &ctx, PassManager & // Perform topological sort // FIXME : Sort nodes and pass sorted indices in configure all nodes + // Validate all nodes + detail::validate_all_nodes(graph); + // Configure all nodes auto workload = detail::configure_all_nodes(graph, ctx); ARM_COMPUTE_ERROR_ON_MSG(workload.tasks.empty(), "Could not configure all nodes!"); diff --git a/src/graph2/backends/CL/CLDeviceBackend.cpp b/src/graph2/backends/CL/CLDeviceBackend.cpp index e06033121a..28e053415b 100644 --- a/src/graph2/backends/CL/CLDeviceBackend.cpp +++ b/src/graph2/backends/CL/CLDeviceBackend.cpp @@ -30,6 +30,7 @@ #include "arm_compute/graph2/Tensor.h" #include "arm_compute/graph2/backends/BackendRegistrar.h" #include "arm_compute/graph2/backends/CL/CLFunctionFactory.h" +#include "arm_compute/graph2/backends/CL/CLNodeValidator.h" #include "arm_compute/graph2/backends/CL/CLSubTensorHandle.h" #include "arm_compute/graph2/backends/CL/CLTensorHandle.h" @@ -145,13 +146,12 @@ std::unique_ptr CLDeviceBackend::configure_node(INode &n return CLFunctionFactory::create(&node, ctx); } -arm_compute::Status CLDeviceBackend::validate_node(const INode &node) +arm_compute::Status CLDeviceBackend::validate_node(INode &node) { ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating CL node with ID : " << node.id() << std::endl); + ARM_COMPUTE_ERROR_ON(node.assigned_target() != Target::CL); - ARM_COMPUTE_UNUSED(node); - - return Status{}; + return CLNodeValidator::validate(&node); } std::shared_ptr CLDeviceBackend::create_memory_manager(MemoryManagerAffinity affinity) diff --git a/src/graph2/backends/CL/CLNodeValidator.cpp b/src/graph2/backends/CL/CLNodeValidator.cpp new file mode 100644 index 0000000000..851285630e --- /dev/null +++ b/src/graph2/backends/CL/CLNodeValidator.cpp @@ -0,0 +1,64 @@ +/* + * 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/CL/CLNodeValidator.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/CL/CLFunctions.h" + +using namespace arm_compute::utils::cast; + +namespace arm_compute +{ +namespace graph2 +{ +namespace backends +{ +Status CLNodeValidator::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 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 diff --git a/src/graph2/detail/ExecutionHelpers.cpp b/src/graph2/detail/ExecutionHelpers.cpp index a7eba0fec8..48588f1361 100644 --- a/src/graph2/detail/ExecutionHelpers.cpp +++ b/src/graph2/detail/ExecutionHelpers.cpp @@ -75,6 +75,23 @@ void allocate_all_tensors(Graph &g) } } +void validate_all_nodes(Graph &g) +{ + auto &nodes = g.nodes(); + + // Create tasks + for(auto &node : nodes) + { + if(node != nullptr) + { + Target assigned_target = node->assigned_target(); + auto backend = backends::BackendRegistry::get().find_backend(assigned_target); + ARM_COMPUTE_ERROR_ON_MSG(!backend, "Requested backend doesn't exist!"); + backend->validate_node(*node); + } + } +} + ExecutionWorkload configure_all_nodes(Graph &g, GraphContext &ctx) { ExecutionWorkload workload; -- cgit v1.2.1