From 175c8e6cc09b0e7991376b6cf71abb7e963e5d5c Mon Sep 17 00:00:00 2001 From: xuanyue Date: Sat, 9 Oct 2021 16:54:13 +0800 Subject: [PATCH] code review part9 --- .../lite/tools/optimizer/common/pass_manager_extends.cc | 2 +- .../tools/optimizer/fusion/affine_activation_fusion.cc | 8 ++++---- mindspore/lite/tools/optimizer/fusion/affine_fusion.cc | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mindspore/lite/tools/optimizer/common/pass_manager_extends.cc b/mindspore/lite/tools/optimizer/common/pass_manager_extends.cc index e0a794064bc..744519327d0 100644 --- a/mindspore/lite/tools/optimizer/common/pass_manager_extends.cc +++ b/mindspore/lite/tools/optimizer/common/pass_manager_extends.cc @@ -75,7 +75,7 @@ bool PassManager::Run(const FuncGraphPtr &func_graph, const std::vector #endif num++; } else { - MS_LOG(INFO) << "pass " << pass->name() << "is null"; + MS_LOG(INFO) << "pass is null"; } } return changed; diff --git a/mindspore/lite/tools/optimizer/fusion/affine_activation_fusion.cc b/mindspore/lite/tools/optimizer/fusion/affine_activation_fusion.cc index 8fb89a3491f..2871abd8d15 100644 --- a/mindspore/lite/tools/optimizer/fusion/affine_activation_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/affine_activation_fusion.cc @@ -59,12 +59,12 @@ const AnfNodePtr AffineActivationFusion::Process(const FuncGraphPtr &func_graph, return nullptr; } auto affine_node = pre_node->cast(); - if (IsMarkedTrainOp(affine_node)) { + if (affine_node == nullptr) { + MS_LOG(ERROR) << "the affine_node is null."; + lite::ReturnCode::GetSingleReturnCode()->UpdateReturnCode(lite::RET_NULL_PTR); return nullptr; } - if (pre_node == nullptr) { - MS_LOG(ERROR) << "the splice_node is null."; - lite::ReturnCode::GetSingleReturnCode()->UpdateReturnCode(lite::RET_NULL_PTR); + if (IsMarkedTrainOp(affine_node)) { return nullptr; } auto affine_prim = GetValueNode>(affine_node->input(kAnfPrimitiveIndex)); diff --git a/mindspore/lite/tools/optimizer/fusion/affine_fusion.cc b/mindspore/lite/tools/optimizer/fusion/affine_fusion.cc index 316ae2cc325..d547af8dc42 100644 --- a/mindspore/lite/tools/optimizer/fusion/affine_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/affine_fusion.cc @@ -68,14 +68,14 @@ const AnfNodePtr AffineFusion::Process(const FuncGraphPtr &func_graph, const Anf return nullptr; } auto splice_node = pre_node->cast(); - if (IsMarkedTrainOp(splice_node)) { - return nullptr; - } - if (pre_node == nullptr) { + if (splice_node == nullptr) { MS_LOG(ERROR) << "the splice_node is null."; lite::ReturnCode::GetSingleReturnCode()->UpdateReturnCode(lite::RET_NULL_PTR); return nullptr; } + if (IsMarkedTrainOp(splice_node)) { + return nullptr; + } auto splice_prim = GetValueNode>(splice_node->input(kAnfPrimitiveIndex)); MS_ASSERT(prim != nullptr); /**