Pre Merge pull request !164 from zhengyuanhua/development

ge/graph/load/new_model_manager/davinci_model.cc

@@ -2050,6 +2050,7 @@ Status DavinciModel::SinkModelProfile() {
   std::set<uint32_t> task_id_set;
   for (int32_t i = 0; i < task_num; i++) {
     auto task = task_list_[i];
+    GE_CHECK_NOTNULL(task);
     auto fusion_op_info = task->GetFusionOpInfo();
     // when type is RT_MODEL_TASK_KERNEL, ctx is not null
     if (fusion_op_info != nullptr) {
@@ -2076,6 +2077,7 @@ Status DavinciModel::SinkModelProfile() {
   using Range = std::pair<CIT, CIT>;
   for (int32_t i = 0; i < task_num; i++) {
     auto task = task_list_[i];
+    GE_CHECK_NOTNULL(task);
     auto fusion_op_info = task->GetFusionOpInfo();
     if (fusion_op_info != nullptr && fusion_op_info->original_op_names.size() > 0) {
       uint32_t task_id = task->GetTaskID();

ge/graph/preprocess/insert_op/util_insert_aipp_op.cc

@@ -34,7 +34,6 @@
 #include "graph/utils/op_desc_utils.h"
 #include "graph/utils/tensor_utils.h"
 #include "graph/utils/type_utils.h"
-#include "util_insert_aipp_op.h"
 
 using domi::AippOpParams;