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/SubGraph.cpp | 110 ------------------------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 src/graph/SubGraph.cpp (limited to 'src/graph/SubGraph.cpp') diff --git a/src/graph/SubGraph.cpp b/src/graph/SubGraph.cpp deleted file mode 100644 index b1cbb9cc95..0000000000 --- a/src/graph/SubGraph.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2017-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/SubGraph.h" - -#include "arm_compute/graph/Graph.h" -#include "arm_compute/graph/INode.h" -#include "arm_compute/graph/Tensor.h" - -using namespace arm_compute::graph; - -SubGraph::SubGraph() - : _nodes(), _input(nullptr), _output(nullptr) -{ -} - -void SubGraph::add_node(std::unique_ptr node) -{ - _nodes.push_back(std::move(node)); -} - -void SubGraph::add_tensor_object(std::unique_ptr tensor) -{ - // If it's the first Tensor added then it will be the input of the Graph. - if(_input == nullptr) - { - _input = std::move(tensor); - } - else - { - _output = std::move(tensor); - } -} - -std::unique_ptr SubGraph::construct(const GraphContext &ctx, std::unique_ptr input, std::unique_ptr output) -{ - auto graph = arm_compute::support::cpp14::make_unique(); - - // Set hint - // TODO(geopin01): store hints of sub-graph - graph->hints() = ctx.hints(); - - // Configure input - if(_input == nullptr) - { - _input = std::move(input); - } - graph->add_tensor_object(std::move(_input)); - - // Make sure first and last nodes of the subgraph always do operations out-of-place - _nodes.front()->set_supports_in_place(false); - _nodes.back()->set_supports_in_place(false); - - // Construct nodes - for(auto &node : _nodes) - { - graph->add_node(std::move(node)); - } - - // Configure output - if(_output == nullptr) - { - _output = std::move(output); - } - graph->add_tensor_object(std::move(_output)); - - return graph; -} - -bool SubGraph::has_input() const -{ - return _input != nullptr; -} - -bool SubGraph::has_output() const -{ - return _output != nullptr; -} - -SubGraph &arm_compute::graph::operator<<(SubGraph &graph, Tensor &&tensor) -{ - graph.add_tensor_object(arm_compute::support::cpp14::make_unique(std::move(tensor))); - return graph; -} - -SubGraph &arm_compute::graph::operator<<(SubGraph &graph, SubTensor &&sub_tensor) -{ - graph.add_tensor_object(arm_compute::support::cpp14::make_unique(std::move(sub_tensor))); - return graph; -} -- cgit v1.2.1