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/frontend/Stream.cpp | 69 ++++++++++++++++++++++++++++++++++++++++ src/graph/frontend/SubStream.cpp | 59 ++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 src/graph/frontend/Stream.cpp create mode 100644 src/graph/frontend/SubStream.cpp (limited to 'src/graph/frontend') diff --git a/src/graph/frontend/Stream.cpp b/src/graph/frontend/Stream.cpp new file mode 100644 index 0000000000..96a166c79c --- /dev/null +++ b/src/graph/frontend/Stream.cpp @@ -0,0 +1,69 @@ +/* + * 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/frontend/Stream.h" + +#include "arm_compute/graph/Utils.h" +#include "arm_compute/graph/frontend/ILayer.h" + +namespace arm_compute +{ +namespace graph +{ +namespace frontend +{ +Stream::Stream(size_t id, std::string name) + : _manager(), _ctx(), _g(id, std::move(name)) +{ +} + +void Stream::finalize(Target target, const GraphConfig &config) +{ + PassManager pm = create_default_pass_manager(target); + _ctx.set_config(config); + _manager.finalize_graph(_g, _ctx, pm, target); +} + +void Stream::run() +{ + _manager.execute_graph(_g); +} + +void Stream::add_layer(ILayer &layer) +{ + auto nid = layer.create_layer(*this); + _tail_node = nid; +} + +const Graph &Stream::graph() const +{ + return _g; +} + +Graph &Stream::graph() +{ + return _g; +} +} // namespace frontend +} // namespace graph +} // namespace arm_compute \ No newline at end of file diff --git a/src/graph/frontend/SubStream.cpp b/src/graph/frontend/SubStream.cpp new file mode 100644 index 0000000000..e8bd23a557 --- /dev/null +++ b/src/graph/frontend/SubStream.cpp @@ -0,0 +1,59 @@ +/* + * 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/frontend/SubStream.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/frontend/ILayer.h" + +namespace arm_compute +{ +namespace graph +{ +namespace frontend +{ +SubStream::SubStream(IStream &s) + : _s(s) +{ + _hints = s.hints(); + _tail_node = s.tail_node(); +} + +void SubStream::add_layer(ILayer &layer) +{ + auto nid = layer.create_layer(*this); + _tail_node = nid; +} + +const Graph &SubStream::graph() const +{ + return _s.graph(); +} + +Graph &SubStream::graph() +{ + return _s.graph(); +} +} // namespace frontend +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1