[NPU][RKNPU]in SSD network,calculate boxcoder boxes&variance in opt-time #5788
Conversation
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
|
Thanks for your contribution! |
hong19860320
reviewed
Apr 7, 2021
| } | ||
| return strides; | ||
| } | ||
| void ConcatEliminator::ComputeConcat(const std::vector<lite::Tensor*> inputs, |
| namespace paddle { | ||
| namespace lite { | ||
| namespace mir { | ||
| std::vector<size_t> ConcatEliminator::StrideNumel(const DDim& ddim) { |
| } | ||
| } | ||
| void ConcatEliminator::BuildPattern() { | ||
| auto* reshape2_output_0 = VarNode("reshape2_output_0") |
| auto out_stride = StrideNumel(output->dims()); | ||
| void* dst = output->mutable_data<float>() + output_offset; | ||
| const void* src = in->data<float>(); | ||
| // src and dst tensor should have the same dims size. |
| auto* concat_output_0 = | ||
| VarNode("concat_output_0")->assert_is_op_output("concat", "Out"); | ||
|
|
||
| // concat topology |
| auto reshape_instruct = matched.at("reshape2")->stmt(); | ||
| auto op_desc = reshape_instruct->mutable_op_info(); | ||
| auto* scope = reshape_instruct->op()->scope(); | ||
| // get reshape's input tensor |
| auto output_t = output_var->GetMutable<lite::Tensor>(); | ||
| // get reshape's other attr | ||
|
|
||
| // calcu reshape |
There was a problem hiding this comment.
Calc reshape offline?
| @@ -67,7 +67,7 @@ class FuseBase { | |||
| void PerformPatternMatcher(SSAGraph* graph); | |||
|
|
|||
| // Delete nodes that are marked as Intermediate | |||
| void DeleteInterNodes(SSAGraph* graph); | |||
| virtual void DeleteInterNodes(SSAGraph* graph); | |||
lite/core/optimizer.h
Outdated
| @@ -112,6 +112,9 @@ class Optimizer { | |||
| "lite_scale_activation_fuse_pass", // | |||
| "lite_elementwise_scale_fuse_pass", // | |||
| "lite_instance_norm_activation_fuse_pass", // | |||
| "lite_priorbox_eliminate_pass", // | |||
lite/core/program.cc
Outdated
| @@ -76,6 +76,12 @@ void RuntimeProgram::SaveToProgram( | |||
| if (it != origin_var_maps.end()) { | |||
| v->SetType(it->second.GetType()); | |||
| v->SetPersistable(it->second.Persistable()); | |||
| if (it->second.GetType() == cpp::VarDesc::Type::LOD_TENSOR) { | |||
| auto tensor = scope->FindVar(var_name)->GetMutable<Tensor>(); | |||
There was a problem hiding this comment.
是否需要判断下var是否存在？
auto var = scope->FindVar(var_name);
if (var != nullptr) {
auto tensor = var->GetMutable();
if (tensor != nullptr && (tensor->persistable() ^ v->Persistable())) {
v->SetPersistable(tensor->persistable());
}
}
…by review test=develop
…by review test=develop
lite/api/paddle_use_passes.h
Outdated
| @@ -76,6 +76,7 @@ USE_MIR_PASS(control_flow_op_unused_inputs_and_outputs_eliminate_pass); | |||
| USE_MIR_PASS(control_flow_op_shared_inputs_and_outputs_place_sync_pass); | |||
| USE_MIR_PASS(lite_scale_activation_fuse_pass); | |||
| USE_MIR_PASS(lite_instance_norm_activation_fuse_pass); | |||
| USE_MIR_PASS(offline_calc_ssd_boxes_pass); | |||
There was a problem hiding this comment.
ssd_boxes_calc_offline_pass
lite/core/program.cc
Outdated
| auto var = scope->FindVar(var_name); | ||
| if (var != nullptr) { | ||
| auto tensor = var->GetMutable<Tensor>(); | ||
| if (tensor != nullptr && tensor->persistable() && |
…by review test=develop
…by review test=develop
…by review test=develop
…by review test=develop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
test=develop
offilne-calculate boxcoder' boxes&variances, remove related priorbox & reshape or flatten & concat