-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CHERRY-Pick: Inference: fix mask rcnn model diff, optim memory usage,…
… memory leak. #18532 (#18547) fix mask rcnn add interface for setting optim_cache_dir(eg: when in trt int8 mode, and load model from memory, there should be a interface for setting the trt calibration table data dir) test=release/1.5
- Loading branch information
Showing
19 changed files
with
354 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
paddle/fluid/inference/analysis/passes/inference_op_replace_pass.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #include "paddle/fluid/inference/analysis/passes/inference_op_replace_pass.h" | ||
| #include <unordered_map> | ||
|
|
||
| namespace paddle { | ||
| namespace inference { | ||
| namespace analysis { | ||
|
|
||
| void InferenceOpReplacePass::RunImpl(Argument* argument) { | ||
| if (!argument->use_gpu()) return; | ||
| std::unordered_map<std::string, std::string> replaced_map{ | ||
| {"conditional_block", "conditional_block_infer"}, | ||
| }; | ||
|
|
||
| auto& graph = argument->main_graph(); | ||
| auto nodes = graph.Nodes(); | ||
|
|
||
| for (auto& node : nodes) { | ||
| if (!node->IsOp()) continue; | ||
| auto* op_desc = node->Op(); | ||
| std::string op_type = op_desc->Type(); | ||
| if (!replaced_map.count(op_type)) continue; | ||
| op_desc->SetType(replaced_map[op_type]); | ||
| op_desc->Flush(); | ||
| } | ||
| } | ||
|
|
||
| std::string InferenceOpReplacePass::repr() const { | ||
| return "inference-op-replace-pass"; | ||
| } | ||
|
|
||
| } // namespace analysis | ||
| } // namespace inference | ||
| } // namespace paddle |
43 changes: 43 additions & 0 deletions
43
paddle/fluid/inference/analysis/passes/inference_op_replace_pass.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <string> | ||
| #include <vector> | ||
|
|
||
| #include "paddle/fluid/framework/ir/fuse_pass_base.h" | ||
| #include "paddle/fluid/framework/scope.h" | ||
| #include "paddle/fluid/inference/analysis/analysis_pass.h" | ||
| #include "paddle/fluid/platform/place.h" | ||
|
|
||
| namespace paddle { | ||
| namespace inference { | ||
| namespace analysis { | ||
|
|
||
| /* | ||
| * There are some ops (while, conditional_block_op etc) which have different | ||
| * optimization points under predicion and training conditions. | ||
| * So, We added the corresponding inference impl to these ops separately. | ||
| * This pass replaces these ops with corresponding inference ops. | ||
| */ | ||
| class InferenceOpReplacePass : public AnalysisPass { | ||
| public: | ||
| void RunImpl(Argument *argument) override; | ||
| std::string repr() const override; | ||
| }; | ||
|
|
||
| } // namespace analysis | ||
| } // namespace inference | ||
| } // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.