Skip to content

Commit 5ed3e6f

Browse files
authored
Merge pull request #14042 from luotao1/remove_unused_code
[1.1] remove unused code in paddle_inference_api.h
2 parents 04689f5 + 8ab953e commit 5ed3e6f

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

paddle/fluid/inference/analysis/analyzer.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ void Analyzer::Run(Argument* argument) {
107107
passes.push_back("mkldnn_placement_pass");
108108
}
109109
#endif
110+
// infer_clean_graph_pass should be the first default pass
111+
// after mkldnn_placement_pass.
112+
passes.push_back("infer_clean_graph_pass");
110113
for (auto& pass : ir_passes_) {
111114
if (!disabled_ir_passes_.count(pass)) {
112115
passes.push_back(pass);

paddle/fluid/inference/analysis/analyzer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class Analyzer : public OrderedRegistry<PassManager> {
6767
// larger fusion.
6868
const std::vector<std::string> all_ir_passes_{{
6969
// Manual update the passes here.
70-
"infer_clean_graph_pass", //
7170
"attention_lstm_fuse_pass", //
7271
"seqconv_eltadd_relu_fuse_pass", //
7372
"embedding_fc_lstm_fuse_pass", //

paddle/fluid/inference/api/paddle_inference_api.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ZeroCopyTensor {
124124
std::vector<std::vector<size_t>> lod() const;
125125

126126
protected:
127-
ZeroCopyTensor(void* scope) : scope_{scope} {}
127+
explicit ZeroCopyTensor(void* scope) : scope_{scope} {}
128128
void SetName(const std::string& name) { name_ = name; }
129129
void* FindTensor() const;
130130

@@ -259,12 +259,6 @@ struct AnalysisConfig : public NativeConfig {
259259
kExclude // Specify the disabled passes in `ir_passes`.
260260
};
261261

262-
void SetIncludeMode() {
263-
ir_mode = IrPassMode::kInclude;
264-
// this pass has to be run at the beginning of all fuse passes
265-
ir_passes = {"infer_clean_graph_pass"};
266-
}
267-
268262
// Determine whether to perform graph optimization.
269263
bool enable_ir_optim = true;
270264
// Manually determine the IR passes to run.

0 commit comments

Comments
 (0)