提交 b1401fb7 编写于 作者: Y Yiqun Liu 提交者: 石晓伟

Remove subgraph_detector from inference/analysis to the common framework/ir directory. (#22094)

test=develop
上级 50bee83f
...@@ -39,6 +39,7 @@ cc_library(graph_helper SRCS graph_helper.cc DEPS graph) ...@@ -39,6 +39,7 @@ cc_library(graph_helper SRCS graph_helper.cc DEPS graph)
cc_library(pass SRCS pass.cc DEPS graph node graph_helper) cc_library(pass SRCS pass.cc DEPS graph node graph_helper)
cc_library(graph_traits SRCS graph_traits.cc DEPS graph) cc_library(graph_traits SRCS graph_traits.cc DEPS graph)
cc_library(graph_pattern_detector SRCS graph_pattern_detector.cc DEPS graph graph_helper graph_traits) cc_library(graph_pattern_detector SRCS graph_pattern_detector.cc DEPS graph graph_helper graph_traits)
cc_library(subgraph_detector SRCS subgraph_detector.cc DEPS graph_pattern_detector executor)
cc_library(fuse_pass_base SRCS fuse_pass_base.cc DEPS pass) cc_library(fuse_pass_base SRCS fuse_pass_base.cc DEPS pass)
cc_library(placement_pass_base SRCS placement_pass_base.cc DEPS pass) cc_library(placement_pass_base SRCS placement_pass_base.cc DEPS pass)
...@@ -99,7 +100,7 @@ endif() ...@@ -99,7 +100,7 @@ endif()
if(WITH_NGRAPH) if(WITH_NGRAPH)
cc_library(ngraph_subgraph_pass SRCS ngraph_subgraph_pass.cc DEPS ngraph_bridge cc_library(ngraph_subgraph_pass SRCS ngraph_subgraph_pass.cc DEPS ngraph_bridge
analysis_helper subgraph_detector graph_pattern_detector pass fuse_pass_base ${op_library_DEPS}) subgraph_detector fuse_pass_base ${op_library_DEPS})
set(pass_file ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/paddle_inference_pass.h) set(pass_file ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/paddle_inference_pass.h)
file(APPEND ${pass_file} "USE_PASS(ngraph_subgraph_pass);\n") file(APPEND ${pass_file} "USE_PASS(ngraph_subgraph_pass);\n")
set(INFER_IR_PASSES ${INFER_IR_PASSES} ngraph_subgraph_pass CACHE INTERNAL "") set(INFER_IR_PASSES ${INFER_IR_PASSES} ngraph_subgraph_pass CACHE INTERNAL "")
......
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
#include "paddle/fluid/framework/ir/graph_helper.h" #include "paddle/fluid/framework/ir/graph_helper.h"
#include "paddle/fluid/framework/ir/graph_pattern_detector.h" #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
#include "paddle/fluid/framework/ir/ngraph_subgraph_pass.h" #include "paddle/fluid/framework/ir/ngraph_subgraph_pass.h"
#include "paddle/fluid/inference/analysis/helper.h" #include "paddle/fluid/framework/ir/subgraph_detector.h"
#include "paddle/fluid/inference/analysis/ir_passes/subgraph_detector.h"
#include "paddle/fluid/operators/ngraph/ngraph_bridge.h" #include "paddle/fluid/operators/ngraph/ngraph_bridge.h"
#include "paddle/fluid/platform/enforce.h" #include "paddle/fluid/platform/enforce.h"
#include "paddle/fluid/string/pretty_log.h" #include "paddle/fluid/string/pretty_log.h"
...@@ -30,8 +29,6 @@ namespace paddle { ...@@ -30,8 +29,6 @@ namespace paddle {
namespace framework { namespace framework {
namespace ir { namespace ir {
namespace ANAT = paddle::inference::analysis;
std::string GenerateEngineKey(const std::set<std::string> &engine_inputs, std::string GenerateEngineKey(const std::set<std::string> &engine_inputs,
const std::set<std::string> &engine_outputs, const std::set<std::string> &engine_outputs,
const std::string &size) { const std::string &size) {
...@@ -59,19 +56,18 @@ void NgraphSubgraphPass::ApplyImpl(Graph *graph) const { ...@@ -59,19 +56,18 @@ void NgraphSubgraphPass::ApplyImpl(Graph *graph) const {
return !paddle::operators::NgraphBridge::isRegister(op_type); return !paddle::operators::NgraphBridge::isRegister(op_type);
}; };
ANAT::SubGraphFuser fuser(graph, teller, 0, "ngraph_engine"); SubGraphFuser fuser(graph, teller, 0, "ngraph_engine");
fuser(); fuser();
for (auto *node : graph->Nodes()) { for (auto *node : graph->Nodes()) {
if (node->IsOp() && !ANAT::Agent(node).subgraph()->empty()) { if (node->IsOp() && !Agent(node).subgraph()->empty()) {
OpDesc *op_desc = node->Op(); OpDesc *op_desc = node->Op();
op_desc->SetType("ngraph_engine"); op_desc->SetType("ngraph_engine");
CreateNgraphEngineOp(node, graph); CreateNgraphEngineOp(node, graph);
std::unordered_set<const Node *> nodes2remove( std::unordered_set<const Node *> nodes2remove(
ANAT::Agent(node).subgraph()->begin(), Agent(node).subgraph()->begin(), Agent(node).subgraph()->end());
ANAT::Agent(node).subgraph()->end());
GraphSafeRemoveNodes(graph, nodes2remove); GraphSafeRemoveNodes(graph, nodes2remove);
} }
...@@ -79,7 +75,7 @@ void NgraphSubgraphPass::ApplyImpl(Graph *graph) const { ...@@ -79,7 +75,7 @@ void NgraphSubgraphPass::ApplyImpl(Graph *graph) const {
std::unordered_set<const Node *> nodes2remove; std::unordered_set<const Node *> nodes2remove;
for (auto *node : graph->Nodes()) { for (auto *node : graph->Nodes()) {
if (node->IsOp() && ANAT::Agent(node).deleted()) { if (node->IsOp() && Agent(node).deleted()) {
nodes2remove.insert(node); nodes2remove.insert(node);
} }
} }
...@@ -116,7 +112,7 @@ void UpdateNgraphIO(Node *node, Graph *graph, ...@@ -116,7 +112,7 @@ void UpdateNgraphIO(Node *node, Graph *graph,
return; return;
} }
auto &subgraph = *ANAT::Agent(node).subgraph(); auto &subgraph = *Agent(node).subgraph();
std::unordered_set<std::string> inputs; std::unordered_set<std::string> inputs;
std::unordered_set<std::string> outputs; std::unordered_set<std::string> outputs;
for (auto *node : subgraph) { for (auto *node : subgraph) {
...@@ -138,7 +134,7 @@ void UpdateNgraphIO(Node *node, Graph *graph, ...@@ -138,7 +134,7 @@ void UpdateNgraphIO(Node *node, Graph *graph,
} }
void NgraphSubgraphPass::CreateNgraphEngineOp(Node *node, Graph *graph) const { void NgraphSubgraphPass::CreateNgraphEngineOp(Node *node, Graph *graph) const {
auto &subgraph = *ANAT::Agent(node).subgraph(); auto &subgraph = *Agent(node).subgraph();
PADDLE_ENFORCE_NE(subgraph.empty(), true, "subgraph cannot be empty"); PADDLE_ENFORCE_NE(subgraph.empty(), true, "subgraph cannot be empty");
framework::proto::BlockDesc block_proto; framework::proto::BlockDesc block_proto;
......
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved. /* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
/* #pragma once
* This file defines the the class to partition a graph.
*/ #include <string>
#include <vector>
#pragma once #include "paddle/fluid/framework/ir/graph.h"
#include "paddle/fluid/framework/ir/graph_traits.h"
#include <string> #include "paddle/fluid/framework/ir/node.h"
#include <vector>
#include "paddle/fluid/framework/ir/graph.h" namespace paddle {
#include "paddle/fluid/framework/ir/graph_traits.h" namespace framework {
#include "paddle/fluid/framework/ir/node.h" namespace ir {
#include "paddle/fluid/inference/analysis/argument.h"
#include "paddle/fluid/inference/analysis/helper.h" const char kIsFunctionNode[] = "__is_function_node__";
const char kFunctionNodeSubGraph[] = "__function_node_sub_graph__";
namespace paddle { const char kSubgraphSplitterMarkerAttrName[] =
namespace inference { "_sub_graph_splitter_inside_sub_graph";
namespace analysis {
/*
using framework::ir::Graph; * Detect the nodes in a sub-graph that meet some conditions. This class doesn't
using framework::ir::NodesTSIterator; * modify the graph.
*/
const char kIsFunctionNode[] = "__is_function_node__"; class SubgraphDetector {
const char kFunctionNodeSubGraph[] = "__function_node_sub_graph__"; public:
const char kSubgraphSplitterMarkerAttrName[] = // Tell whether a node is inside a sub-graph.
"_sub_graph_splitter_inside_sub_graph"; using NodeInsideSubgraphTeller = std::function<bool(const Node *)>;
/* SubgraphDetector(Graph *graph, const NodeInsideSubgraphTeller &teller)
* Detect the nodes in a sub-graph that meet some conditions. This class doesn't : graph_(graph), node_inside_subgraph_teller_(teller) {}
* modify the graph.
*/ std::vector<std::vector<Node *>> operator()();
class SubgraphDetector {
public: protected:
// Tell whether a node is inside a sub-graph. // Mark the nodes inside the accepted sub-graph using
using NodeInsideSubgraphTeller = // node_inside_subgraph_teller.
std::function<bool(const framework::ir::Node *)>; void MarkNodesInsideSubGraph();
SubgraphDetector(Graph *graph, const NodeInsideSubgraphTeller &teller) // Merge the marked nodes into sub-graphs and return the sub-graphs.
: graph_(graph), node_inside_subgraph_teller_(teller) {} std::vector<std::vector<Node *>> ExtractSubGraphs();
std::vector<std::vector<framework::ir::Node *>> operator()(); private:
Graph *graph_;
protected: NodeInsideSubgraphTeller node_inside_subgraph_teller_;
// Mark the nodes inside the accepted sub-graph using };
// node_inside_subgraph_teller.
void MarkNodesInsideSubGraph(); /*
* SubGraphFuser - Replace some nodes with the sub-graph node they are inside.
// Merge the marked nodes into sub-graphs and return the sub-graphs. * To some extent, the TensorRT engine is just a fusion op for a model.
std::vector<std::vector<framework::ir::Node *>> ExtractSubGraphs(); */
class SubGraphFuser {
private: public:
Graph *graph_; using NodeInsideSubgraphTeller = SubgraphDetector::NodeInsideSubgraphTeller;
NodeInsideSubgraphTeller node_inside_subgraph_teller_;
}; SubGraphFuser(Graph *graph, const NodeInsideSubgraphTeller &teller,
int min_subgraph_size, std::string name = "anakin_engine")
/* : graph_(graph),
* SubGraphFuser - Replace some nodes with the sub-graph node they are inside. node_inside_subgraph_teller_(teller),
* To some extent, the TensorRT engine is just a fusion op for a model. min_subgraph_size_{min_subgraph_size},
*/ name_{name} {}
class SubGraphFuser {
public: // The main method which run all the logic.
using NodeInsideSubgraphTeller = SubgraphDetector::NodeInsideSubgraphTeller; void operator()();
SubGraphFuser(Graph *graph, const NodeInsideSubgraphTeller &teller, protected:
int min_subgraph_size, std::string name = "anakin_engine") // Remove the nodes inside sub-graphs and replace with the SubGraphNode.
: graph_(graph), void ReplaceNodesWithSubGraphs();
node_inside_subgraph_teller_(teller),
min_subgraph_size_{min_subgraph_size}, private:
name_{name} {} Graph *graph_;
NodeInsideSubgraphTeller node_inside_subgraph_teller_;
// The main method which run all the logic. int min_subgraph_size_;
void operator()(); const std::string name_;
};
protected:
// Remove the nodes inside sub-graphs and replace with the SubGraphNode. struct NodeWrapper {
void ReplaceNodesWithSubGraphs(); bool deleted{false};
bool marked{false};
private: int union_find_parent{-1};
Graph *graph_; std::vector<Node *> subgraph;
NodeInsideSubgraphTeller node_inside_subgraph_teller_; };
int min_subgraph_size_;
const std::string name_; /*
}; * ir::Node agent for subgraph detector.
*/
struct NodeWrapper { struct Agent {
bool deleted{false}; explicit Agent(Node *x) : x_(x) {}
bool marked{false};
int union_find_parent{-1}; NodeWrapper &wrapper() {
std::vector<framework::ir::Node *> subgraph; if (!x_->IsWrappedBy<NodeWrapper>()) {
}; x_->WrappedBy<NodeWrapper>(new NodeWrapper);
}
/* return x_->template Wrapper<NodeWrapper>();
* ir::Node agent for subgraph detector. }
*/
struct Agent { bool deleted() { return wrapper().deleted; }
explicit Agent(framework::ir::Node *x) : x_(x) {} void set_deleted(bool x) { wrapper().deleted = x; }
NodeWrapper &wrapper() { bool marked() { return wrapper().marked; }
if (!x_->IsWrappedBy<NodeWrapper>()) { void set_marked(bool x) { wrapper().marked = x; }
x_->WrappedBy<NodeWrapper>(new NodeWrapper);
} void set_subgraph(const std::vector<framework::ir::Node *> &x) {
return x_->template Wrapper<NodeWrapper>(); wrapper().subgraph = x;
} }
bool deleted() { return wrapper().deleted; } int union_find_parent() { return wrapper().union_find_parent; }
void set_deleted(bool x) { wrapper().deleted = x; } void set_union_find_parent(int v) { wrapper().union_find_parent = v; }
bool marked() { return wrapper().marked; } std::vector<Node *> *subgraph() { return &wrapper().subgraph; }
void set_marked(bool x) { wrapper().marked = x; } std::vector<Node *> &inputs() { return x_->inputs; }
std::vector<Node *> &outputs() { return x_->outputs; }
void set_subgraph(const std::vector<framework::ir::Node *> &x) {
wrapper().subgraph = x; private:
} Node *x_;
};
int union_find_parent() { return wrapper().union_find_parent; }
void set_union_find_parent(int v) { wrapper().union_find_parent = v; } // The nodes those have no input will be treated as start points.
static std::vector<Node *> ExtractStartPoints(const Graph &g) {
std::vector<framework::ir::Node *> *subgraph() { return &wrapper().subgraph; } std::vector<Node *> result;
std::vector<framework::ir::Node *> &inputs() { return x_->inputs; } for (auto *node : g.Nodes()) {
std::vector<framework::ir::Node *> &outputs() { return x_->outputs; } if (node->inputs.empty()) {
result.push_back(node);
private: }
framework::ir::Node *x_; }
}; return result;
}
// The nodes those have no input will be treated as start points.
static std::vector<framework::ir::Node *> ExtractStartPoints(const Graph &g) { static iterator_range<NodesTSIterator> TopologicalSort(const Graph &g) {
std::vector<framework::ir::Node *> result; auto start_points = ExtractStartPoints(g);
for (auto *node : g.Nodes()) { PADDLE_ENFORCE_GT(
if (node->inputs.empty()) { start_points.size(), 0U,
result.push_back(node); platform::errors::InvalidArgument(
} "Expected the number of graph's start points >= 1. Expected %d.",
} start_points.size()));
return result; NodesTSIterator x(start_points);
} return iterator_range<NodesTSIterator>(NodesTSIterator(start_points),
NodesTSIterator());
static iterator_range<NodesTSIterator> TopologicalSort(const Graph &g) { }
auto start_points = ExtractStartPoints(g);
PADDLE_ENFORCE(!start_points.empty()); } // namespace ir
NodesTSIterator x(start_points); } // namespace framework
return iterator_range<NodesTSIterator>(NodesTSIterator(start_points), } // namespace paddle
NodesTSIterator());
}
} // namespace analysis
} // namespace inference
} // namespace paddle
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "paddle/fluid/framework/ir/graph.h" #include "paddle/fluid/framework/ir/graph.h"
#include "paddle/fluid/framework/scope.h" #include "paddle/fluid/framework/scope.h"
#include "paddle/fluid/inference/analysis/argument.h" #include "paddle/fluid/inference/analysis/argument.h"
#include "paddle/fluid/inference/analysis/ir_passes/subgraph_detector.h"
#include "paddle/fluid/string/pretty_log.h" #include "paddle/fluid/string/pretty_log.h"
namespace paddle { namespace paddle {
......
cc_library(subgraph_detector SRCS subgraph_detector.cc subgraph_util.cc DEPS proto_desc) cc_library(subgraph_util SRCS subgraph_util.cc DEPS subgraph_detector)
if(WITH_TESTING)
add_dependencies(subgraph_detector gtest)
endif()
if (WITH_GPU AND TENSORRT_FOUND) if (WITH_GPU AND TENSORRT_FOUND)
cc_library(tensorrt_subgraph_pass SRCS tensorrt_subgraph_pass.cc DEPS subgraph_detector tensorrt_op_teller) cc_library(tensorrt_subgraph_pass SRCS tensorrt_subgraph_pass.cc DEPS subgraph_util tensorrt_op_teller)
set(analysis_deps ${analysis_deps} set(analysis_deps ${analysis_deps}
subgraph_detector tensorrt_subgraph_pass subgraph_util tensorrt_subgraph_pass
CACHE INTERNAL "") CACHE INTERNAL "")
set(pass_file ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/paddle_inference_pass.h) set(pass_file ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/paddle_inference_pass.h)
...@@ -16,10 +13,10 @@ if (WITH_GPU AND TENSORRT_FOUND) ...@@ -16,10 +13,10 @@ if (WITH_GPU AND TENSORRT_FOUND)
endif() endif()
if (ANAKIN_SUBGRAPH) if (ANAKIN_SUBGRAPH)
cc_library(anakin_subgraph_pass SRCS anakin_subgraph_pass.cc DEPS subgraph_detector anakin_op_teller) cc_library(anakin_subgraph_pass SRCS anakin_subgraph_pass.cc DEPS subgraph_util anakin_op_teller)
set(analysis_deps ${analysis_deps} set(analysis_deps ${analysis_deps}
subgraph_detector anakin_subgraph_pass subgraph_util anakin_subgraph_pass
CACHE INTERNAL "") CACHE INTERNAL "")
set(pass_file ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/paddle_inference_pass.h) set(pass_file ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/paddle_inference_pass.h)
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
#include <vector> #include <vector>
#include "paddle/fluid/framework/ir/graph_pattern_detector.h" #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
#include "paddle/fluid/framework/ir/subgraph_detector.h"
#include "paddle/fluid/inference/anakin/convert/op_converter.h" #include "paddle/fluid/inference/anakin/convert/op_converter.h"
#include "paddle/fluid/inference/anakin/op_teller.h" #include "paddle/fluid/inference/anakin/op_teller.h"
#include "paddle/fluid/inference/analysis/helper.h" #include "paddle/fluid/inference/analysis/helper.h"
#include "paddle/fluid/inference/analysis/ir_passes/anakin_subgraph_pass.h" #include "paddle/fluid/inference/analysis/ir_passes/anakin_subgraph_pass.h"
#include "paddle/fluid/inference/analysis/ir_passes/subgraph_detector.h"
#include "paddle/fluid/string/pretty_log.h" #include "paddle/fluid/string/pretty_log.h"
namespace paddle { namespace paddle {
...@@ -50,7 +50,7 @@ void analysis::AnakinSubgraphPass::ApplyImpl( ...@@ -50,7 +50,7 @@ void analysis::AnakinSubgraphPass::ApplyImpl(
return anakin::OpTeller::Global().Tell(node->Op()->Type(), *node->Op()); return anakin::OpTeller::Global().Tell(node->Op()->Type(), *node->Op());
}; };
SubGraphFuser fuser(graph, teller, 6 /* min_subgraph_size */); framework::ir::SubGraphFuser fuser(graph, teller, 6 /* min_subgraph_size */);
fuser(); fuser();
std::vector<std::string> graph_param_names = std::vector<std::string> graph_param_names =
...@@ -61,17 +61,18 @@ void analysis::AnakinSubgraphPass::ApplyImpl( ...@@ -61,17 +61,18 @@ void analysis::AnakinSubgraphPass::ApplyImpl(
std::vector<std::string> repetitive_params; std::vector<std::string> repetitive_params;
for (auto *node : graph->Nodes()) { for (auto *node : graph->Nodes()) {
if (node->IsOp() && !Agent(node).subgraph()->empty()) { if (node->IsOp() && !framework::ir::Agent(node).subgraph()->empty()) {
CreateAnakinOp(node, graph, graph_param_names, &repetitive_params); CreateAnakinOp(node, graph, graph_param_names, &repetitive_params);
std::unordered_set<const Node *> nodes2remove( std::unordered_set<const Node *> nodes2remove(
Agent(node).subgraph()->begin(), Agent(node).subgraph()->end()); framework::ir::Agent(node).subgraph()->begin(),
framework::ir::Agent(node).subgraph()->end());
framework::ir::GraphSafeRemoveNodes(graph, nodes2remove); framework::ir::GraphSafeRemoveNodes(graph, nodes2remove);
} }
} }
std::unordered_set<const Node *> nodes2remove; std::unordered_set<const Node *> nodes2remove;
for (auto *node : graph->Nodes()) { for (auto *node : graph->Nodes()) {
if (node->IsOp() && Agent(node).deleted()) { if (node->IsOp() && framework::ir::Agent(node).deleted()) {
nodes2remove.insert(node); nodes2remove.insert(node);
} }
} }
...@@ -96,11 +97,11 @@ std::string GenerateAnakinEngineKey(const std::set<std::string> &engine_inputs, ...@@ -96,11 +97,11 @@ std::string GenerateAnakinEngineKey(const std::set<std::string> &engine_inputs,
} }
void AnakinSubgraphPass::CreateAnakinOp( void AnakinSubgraphPass::CreateAnakinOp(
framework::ir::Node *node, Graph *graph, framework::ir::Node *node, framework::ir::Graph *graph,
const std::vector<std::string> &graph_params, const std::vector<std::string> &graph_params,
std::vector<std::string> *repetitive_params) const { std::vector<std::string> *repetitive_params) const {
auto *op_desc = node->Op(); auto *op_desc = node->Op();
auto &subgraph = *Agent(node).subgraph(); auto &subgraph = *framework::ir::Agent(node).subgraph();
PADDLE_ENFORCE(!subgraph.empty()); PADDLE_ENFORCE(!subgraph.empty());
framework::ProgramDesc *program_desc = framework::ProgramDesc *program_desc =
...@@ -164,7 +165,7 @@ void AnakinSubgraphPass::CreateAnakinOp( ...@@ -164,7 +165,7 @@ void AnakinSubgraphPass::CreateAnakinOp(
graph_var_map[node->Name()] = node; graph_var_map[node->Name()] = node;
} }
} }
auto &subgraph_nodes = *Agent(node).subgraph(); auto &subgraph_nodes = *framework::ir::Agent(node).subgraph();
// The following procedure is used to rename all the intermediate // The following procedure is used to rename all the intermediate
// variables and the output variables of the subgraph. // variables and the output variables of the subgraph.
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <set> #include <set>
#include "paddle/fluid/framework/ir/graph_pattern_detector.h" #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
#include "paddle/fluid/framework/ir/subgraph_detector.h"
#include "paddle/fluid/inference/analysis/helper.h" #include "paddle/fluid/inference/analysis/helper.h"
#include "paddle/fluid/inference/analysis/ir_passes/subgraph_detector.h"
#include "paddle/fluid/inference/analysis/ir_passes/tensorrt_subgraph_pass.h" #include "paddle/fluid/inference/analysis/ir_passes/tensorrt_subgraph_pass.h"
#include "paddle/fluid/inference/tensorrt/convert/op_converter.h" #include "paddle/fluid/inference/tensorrt/convert/op_converter.h"
#include "paddle/fluid/inference/tensorrt/engine.h" #include "paddle/fluid/inference/tensorrt/engine.h"
...@@ -40,9 +40,9 @@ void analysis::TensorRtSubgraphPass::ApplyImpl( ...@@ -40,9 +40,9 @@ void analysis::TensorRtSubgraphPass::ApplyImpl(
return tensorrt::OpTeller::Global().Tell(node->Op()->Type(), *node->Op()); return tensorrt::OpTeller::Global().Tell(node->Op()->Type(), *node->Op());
}; };
SubGraphFuser fuser(graph, teller, framework::ir::SubGraphFuser fuser(
Get<int>("min_subgraph_size") /*min subgraph size*/, graph, teller, Get<int>("min_subgraph_size") /*min subgraph size*/,
"tensorrt_engine"); "tensorrt_engine");
fuser(); fuser();
std::vector<std::string> graph_param_names = std::vector<std::string> graph_param_names =
...@@ -52,18 +52,19 @@ void analysis::TensorRtSubgraphPass::ApplyImpl( ...@@ -52,18 +52,19 @@ void analysis::TensorRtSubgraphPass::ApplyImpl(
std::vector<std::string> repetitive_params; std::vector<std::string> repetitive_params;
for (auto *node : graph->Nodes()) { for (auto *node : graph->Nodes()) {
if (node->IsOp() && !Agent(node).subgraph()->empty()) { if (node->IsOp() && !framework::ir::Agent(node).subgraph()->empty()) {
CreateTensorRTOp(node, graph, graph_param_names, &repetitive_params); CreateTensorRTOp(node, graph, graph_param_names, &repetitive_params);
std::unordered_set<const Node *> nodes2remove( std::unordered_set<const Node *> nodes2remove(
Agent(node).subgraph()->begin(), Agent(node).subgraph()->end()); framework::ir::Agent(node).subgraph()->begin(),
framework::ir::Agent(node).subgraph()->end());
framework::ir::GraphSafeRemoveNodes(graph, nodes2remove); framework::ir::GraphSafeRemoveNodes(graph, nodes2remove);
} }
} }
std::unordered_set<const Node *> nodes2remove; std::unordered_set<const Node *> nodes2remove;
for (auto *node : graph->Nodes()) { for (auto *node : graph->Nodes()) {
if (node->IsOp() && Agent(node).deleted()) { if (node->IsOp() && framework::ir::Agent(node).deleted()) {
nodes2remove.insert(node); nodes2remove.insert(node);
} }
} }
...@@ -88,11 +89,11 @@ std::string GenerateEngineKey(const std::set<std::string> &engine_inputs, ...@@ -88,11 +89,11 @@ std::string GenerateEngineKey(const std::set<std::string> &engine_inputs,
} }
void TensorRtSubgraphPass::CreateTensorRTOp( void TensorRtSubgraphPass::CreateTensorRTOp(
framework::ir::Node *node, Graph *graph, framework::ir::Node *node, framework::ir::Graph *graph,
const std::vector<std::string> &graph_params, const std::vector<std::string> &graph_params,
std::vector<std::string> *repetitive_params) const { std::vector<std::string> *repetitive_params) const {
auto *op_desc = node->Op(); auto *op_desc = node->Op();
auto &subgraph = *Agent(node).subgraph(); auto &subgraph = *framework::ir::Agent(node).subgraph();
PADDLE_ENFORCE(!subgraph.empty()); PADDLE_ENFORCE(!subgraph.empty());
framework::ProgramDesc *program_desc = framework::ProgramDesc *program_desc =
...@@ -161,7 +162,7 @@ void TensorRtSubgraphPass::CreateTensorRTOp( ...@@ -161,7 +162,7 @@ void TensorRtSubgraphPass::CreateTensorRTOp(
if (precision_mode == AnalysisConfig::Precision::kHalf) enable_fp16 = true; if (precision_mode == AnalysisConfig::Precision::kHalf) enable_fp16 = true;
auto enable_int8 = Get<bool>("enable_int8"); auto enable_int8 = Get<bool>("enable_int8");
auto use_calib_mode = Get<bool>("use_calib_mode"); auto use_calib_mode = Get<bool>("use_calib_mode");
auto &subgraph_nodes = *Agent(node).subgraph(); auto &subgraph_nodes = *framework::ir::Agent(node).subgraph();
// The following procedure is used to rename all the intermediate // The following procedure is used to rename all the intermediate
// variables and the output variables of the subgraph. // variables and the output variables of the subgraph.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册