fix-bug-of-mistakenly-deleting-address-of-scalar-value-node

mindspore/ccsrc/backend/session/session_basic.cc

@@ -1171,7 +1171,8 @@ void SessionBasic::UpdateOutputs(const std::shared_ptr<KernelGraph> &kernel_grap
     MS_EXCEPTION_IF_NULL(tensor);
     tensor->set_device_address(address);
     tensor->SetNeedWait(false);
-
+    MS_LOG(DEBUG) << "Debug address: Output tensor obj " << tensor.get() << ", tensor id " << tensor->id()
+                  << ", device address " << tensor->device_address().get();
     if (ms_context->get_param<int>(MS_CTX_EXECUTION_MODE) != kPynativeMode) {
       tensor->data_sync(false);
       tensor->set_sync_status(kNeedSyncHostToDevice);
@@ -1719,7 +1720,12 @@ void SessionBasic::UpdateGraphDynamicShapeAttr(const NotNull<KernelGraphPtr> &ro
 
 void SessionBasic::CleanUselessTensorsImpl(const std::shared_ptr<std::vector<tensor::TensorPtr>> &useless_tensors) {
   for (const auto &tensor : *useless_tensors) {
-    tensor->set_device_address(nullptr);
+    MS_EXCEPTION_IF_NULL(tensor);
+    const auto &shape = tensor->shape();
+    if (!shape.empty()) {
+      // The address of scalar value node does not need to be deleted
+      tensor->set_device_address(nullptr);
+    }
   }
 }
 

mindspore/ccsrc/pipeline/pynative/pynative_execute.cc

@@ -523,8 +523,9 @@ PynativeExecutor::~PynativeExecutor() {
 py::tuple RunOp(const py::args &args) {
   auto executor = PynativeExecutor::GetInstance();
   MS_EXCEPTION_IF_NULL(executor);
-  MS_LOG(DEBUG) << "RunOp start " << args.size();
   OpExecInfoPtr op_exec_info = executor->GenerateOpExecInfo(args);
+  MS_EXCEPTION_IF_NULL(op_exec_info);
+  MS_LOG(DEBUG) << "RunOp name: " << op_exec_info->op_name << " start, args: " << args.size();
   try {
     return executor->RunOpInner(op_exec_info);
   } catch (const py::error_already_set &ex) {
@@ -708,6 +709,7 @@ AnfNodePtr PynativeExecutor::MakeCNode(const OpExecInfoPtr &op_exec_info, std::v
       }
       node_abs_map_[id] = abs;
     }
+
     (*args_spec_list).emplace_back(abs);
   }
 
@@ -1014,6 +1016,10 @@ void PynativeExecutor::UpdateAbstractAndDeviceAddress(const OpExecInfoPtr &op_ex
       auto &new_tensor = output_tensors[i];
       auto &tensors_in_value_node = tensor_id_with_tensor_[tensor_id];
       std::for_each(tensors_in_value_node.begin(), tensors_in_value_node.end(), [&](tensor::TensorPtr &tensor) {
+        MS_LOG(DEBUG) << "Debug address: Replace forward old tensor obj " << tensor.get() << ", tensor id "
+                      << tensor->id() << ", device address " << tensor->device_address().get()
+                      << " with New tensor obj " << new_tensor.get() << ", tensor id " << new_tensor->id()
+                      << ", device address " << new_tensor->device_address().get();
         tensor->set_shape(new_tensor->shape());
         tensor->set_data_type(new_tensor->data_type());
         if (target != kCPUDevice) {
@@ -1048,6 +1054,8 @@ void PynativeExecutor::SaveTensorsInValueNode(const ResourcePtr &resource) {
     for (const auto &tensor : tensors) {
       if (tensor->device_address() != nullptr) {
         tensor_id_with_tensor_[tensor->id()].emplace_back(tensor);
+        MS_LOG(DEBUG) << "Debug address: Save forward tensor obj " << tensor.get() << ", tensor id " << tensor->id()
+                      << ", device address " << tensor->device_address().get();
       }
     }
   }