From d9eb27597eabe5b7c17520f4f9b3f8a282d72573 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 3 Apr 2018 13:44:29 +0100 Subject: COMPMID-797: Switch to new graph. - Cleaned up build system Change-Id: If2faa27ee5b31fa8b972836960ab3ef671059c8d Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/126435 Tested-by: Jenkins Reviewed-by: Pablo Tello --- src/graph/mutators/DepthConcatSubTensorMutator.cpp | 86 +++++++++++++++++++ src/graph/mutators/InPlaceOperationMutator.cpp | 63 ++++++++++++++ src/graph/mutators/NodeFusionMutator.cpp | 96 ++++++++++++++++++++++ src/graph/mutators/SplitLayerSubTensorMutator.cpp | 89 ++++++++++++++++++++ 4 files changed, 334 insertions(+) create mode 100644 src/graph/mutators/DepthConcatSubTensorMutator.cpp create mode 100644 src/graph/mutators/InPlaceOperationMutator.cpp create mode 100644 src/graph/mutators/NodeFusionMutator.cpp create mode 100644 src/graph/mutators/SplitLayerSubTensorMutator.cpp (limited to 'src/graph/mutators') diff --git a/src/graph/mutators/DepthConcatSubTensorMutator.cpp b/src/graph/mutators/DepthConcatSubTensorMutator.cpp new file mode 100644 index 0000000000..c56f4c5106 --- /dev/null +++ b/src/graph/mutators/DepthConcatSubTensorMutator.cpp @@ -0,0 +1,86 @@ +/* + * 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/graph/mutators/DepthConcatSubTensorMutator.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/Logger.h" +#include "arm_compute/graph/backends/BackendRegistry.h" +#include "arm_compute/graph/nodes/DepthConcatenateLayerNode.h" + +#include "arm_compute/core/utils/misc/Cast.h" +#include "arm_compute/core/utils/misc/Iterable.h" + +namespace arm_compute +{ +namespace graph +{ +const char *DepthConcatSubTensorMutator::name() +{ + return "DepthConcatSubTensorMutator"; +} + +void DepthConcatSubTensorMutator::mutate(Graph &g) +{ + // Should be in reverse order of execution + for(auto &node : arm_compute::utils::iterable::reverse_iterate(g.nodes())) + { + if(node && node->type() == NodeType::DepthConcatenateLayer && node->output(0) != nullptr) + { + // Get output tensor + auto output_tensor = node->output(0); + + // Check that all tensor have the same target and valid inputs + bool is_valid = std::all_of(node->input_edges().cbegin(), node->input_edges().cend(), + [&](const EdgeID & eid) + { + return (g.edge(eid) != nullptr) && (g.edge(eid)->tensor() != nullptr) && (g.edge(eid)->tensor()->desc().target == output_tensor->desc().target); + }); + + // Create subtensors + if(is_valid && backends::BackendRegistry::get().find_backend(output_tensor->desc().target) != nullptr) + { + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Using sub-tensors for the node with ID : " + << node->id() << " and name : " << node->name() << std::endl); + // Create sub-tensor handles + unsigned depth = 0; + for(unsigned int i = 0; i < node->input_edges().size(); ++i) + { + auto input_tensor = node->input(i); + const auto input_shape = input_tensor->desc().shape; + + auto backend = backends::BackendRegistry::get().find_backend(input_tensor->desc().target); + auto handle = backend->create_subtensor(output_tensor->handle(), input_shape, Coordinates(0, 0, depth), false); + input_tensor->set_handle(std::move(handle)); + + depth += input_shape.z(); + } + + auto *dc_node = arm_compute::utils::cast::polymorphic_downcast(node.get()); + dc_node->set_enabled(false); + } + } + } +} +} // namespace graph +} // namespace arm_compute diff --git a/src/graph/mutators/InPlaceOperationMutator.cpp b/src/graph/mutators/InPlaceOperationMutator.cpp new file mode 100644 index 0000000000..bd3f098965 --- /dev/null +++ b/src/graph/mutators/InPlaceOperationMutator.cpp @@ -0,0 +1,63 @@ +/* + * 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/graph/mutators/InPlaceOperationMutator.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/Logger.h" + +namespace arm_compute +{ +namespace graph +{ +const char *InPlaceOperationMutator::name() +{ + return "InPlaceOperationMutator"; +} + +void InPlaceOperationMutator::mutate(Graph &g) +{ + std::set in_place_nodes = { NodeType::BatchNormalizationLayer, NodeType::ActivationLayer }; + + // Not interested in the order of nodes + for(auto &node : g.nodes()) + { + if(node && in_place_nodes.find(node->type()) != std::end(in_place_nodes)) + { + // Get input edge + Edge *input_edge = node->input_edge(0); + + // Check if parent has a single output if yes then force in place calculation else not + if((input_edge != nullptr) && (input_edge->producer() != nullptr) && (input_edge->producer()->output_edges().size() == 1)) + { + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Switching to in-place computation for the node with ID : " + << node->id() << " and name : " << node->name() << std::endl); + // Update output + auto tensor = input_edge->tensor(); + node->set_output_tensor(tensor->id(), 0); + } + } + } +} +} // namespace graph +} // namespace arm_compute diff --git a/src/graph/mutators/NodeFusionMutator.cpp b/src/graph/mutators/NodeFusionMutator.cpp new file mode 100644 index 0000000000..2e893c2e07 --- /dev/null +++ b/src/graph/mutators/NodeFusionMutator.cpp @@ -0,0 +1,96 @@ +/* + * 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/graph/mutators/NodeFusionMutator.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/Logger.h" +#include "arm_compute/graph/nodes/Nodes.h" + +#include "arm_compute/core/utils/misc/Cast.h" + +namespace arm_compute +{ +namespace graph +{ +namespace detail +{ +void fuse_batch_norm_with_activation(Graph &g) +{ + // Not interested in the order of nodes + for(auto &node : g.nodes()) + { + // Check if the node is batch norm and not a branching node + if(node && node->type() == NodeType::BatchNormalizationLayer && node->output_edges().size() == 1) + { + auto output_edge_id = *node->output_edges().begin(); + auto output_edge = g.edge(output_edge_id); + // Check if following node is an activation layer node + if((output_edge != nullptr) && (output_edge->consumer() != nullptr) && (output_edge->consumer()->type() == NodeType::ActivationLayer)) + { + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Fusing Batch Normalization node with ID : " << output_edge->producer_id() + << " with Activation Layer node with ID : " << output_edge->consumer_id() << std::endl); + + auto *bn_node = arm_compute::utils::cast::polymorphic_downcast(output_edge->producer()); + auto *act_node = arm_compute::utils::cast::polymorphic_downcast(output_edge->consumer()); + + // Get driving nodes of activation node + std::vector act_driving_nodes; + for(auto &act_output_edge_id : act_node->output_edges()) + { + auto act_output_edge = g.edge(act_output_edge_id); + if(act_output_edge != nullptr) + { + ARM_COMPUTE_ERROR_ON(act_output_edge->consumer() == nullptr); + act_driving_nodes.push_back({ act_output_edge->consumer_id(), act_output_edge->consumer_idx() }); + } + } + + // Set activation info to batch normalization + bn_node->set_fused_activation(act_node->activation_info()); + + // Remove activation node + g.remove_node(act_node->id()); + + // Update batch normalization node outputs + for(auto &driving_node : act_driving_nodes) + { + g.add_connection(bn_node->id(), 0, driving_node.node_id, driving_node.index); + } + } + } + } +} +} // namespace detail + +const char *NodeFusionMutator::name() +{ + return "NodeFusionMutator"; +} + +void NodeFusionMutator::mutate(Graph &g) +{ + detail::fuse_batch_norm_with_activation(g); +} +} // namespace graph +} // namespace arm_compute diff --git a/src/graph/mutators/SplitLayerSubTensorMutator.cpp b/src/graph/mutators/SplitLayerSubTensorMutator.cpp new file mode 100644 index 0000000000..179a6c35fb --- /dev/null +++ b/src/graph/mutators/SplitLayerSubTensorMutator.cpp @@ -0,0 +1,89 @@ +/* + * 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/graph/mutators/SplitLayerSubTensorMutator.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/Logger.h" +#include "arm_compute/graph/backends/BackendRegistry.h" +#include "arm_compute/graph/nodes/SplitLayerNode.h" + +#include "arm_compute/core/utils/misc/Cast.h" +#include "arm_compute/core/utils/misc/Iterable.h" + +namespace arm_compute +{ +namespace graph +{ +const char *SplitLayerSubTensorMutator::name() +{ + return "SplitLayerSubTensorMutator"; +} + +void SplitLayerSubTensorMutator::mutate(Graph &g) +{ + // Should be in reverse order of execution + for(auto &node : arm_compute::utils::iterable::reverse_iterate(g.nodes())) + { + if(node && node->type() == NodeType::SplitLayer && node->input(0) != nullptr) + { + // Get output tensor + Tensor *input_tensor = node->input(0); + + // Check that all tensor have the same target and are valid + bool is_valid = std::all_of(node->outputs().cbegin(), node->outputs().cend(), + [&](const TensorID & tid) + { + return (g.tensor(tid) != nullptr) && (g.tensor(tid)->desc().target == input_tensor->desc().target); + }); + + // Create subtensors + if(is_valid && backends::BackendRegistry::get().find_backend(input_tensor->desc().target) != nullptr) + { + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Using sub-tensors for the node with ID : " + << node->id() << " and name : " << node->name() << std::endl); + + auto *split_node = arm_compute::utils::cast::polymorphic_downcast(node.get()); + + const unsigned int axis = split_node->axis(); + const unsigned int num_splits = split_node->num_splits(); + const bool extend_parent = (axis < 2); + + // Create sub-tensor handles + for(unsigned int i = 0; i < node->outputs().size(); ++i) + { + Tensor *output_tensor = node->output(i); + const TensorShape output_shape = output_tensor->desc().shape; + Coordinates coords; + std::tie(std::ignore, coords) = SplitLayerNode::compute_output_shape(input_tensor->desc().shape, num_splits, axis, i); + + backends::IDeviceBackend *backend = backends::BackendRegistry::get().find_backend(output_tensor->desc().target); + std::unique_ptr handle = backend->create_subtensor(input_tensor->handle(), output_shape, coords, extend_parent); + output_tensor->set_handle(std::move(handle)); + } + } + } + } +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1