!1323 add make_tuple before return as graph outputs in ConstructKernelGraph

Merge pull request !1323 from wenchunjiang/supplyment_for_construct_graph

mindspore/ccsrc/session/session_basic.cc

@@ -640,6 +640,16 @@ std::shared_ptr<KernelGraph> SessionBasic::ConstructKernelGraph(const FuncGraphP
           MS_EXCEPTION_IF_NULL(func_graph_node);
           auto sub_func_graph = AnfAlgo::GetValueNodeFuncGraph(func_graph_node);
           ConstructKernelGraph(sub_func_graph);
+        } else if (prim->name() == kReturnOpName) {
+          std::vector<AnfNodePtr> outputs;
+          auto inputs = cnode->inputs();
+          if (inputs.size() < 2) {
+            MS_LOG(EXCEPTION) << "CNode[return] must have two inputs at least, actual inputs size is " << inputs.size();
+          }
+          (void)std::copy(inputs.begin() + 1, inputs.end(), std::back_inserter(outputs));
+          // add a make_tuple before return as graph output
+          graph->set_output(ConstructOutput(outputs, graph));
+          continue;
         }
       }
 
@@ -649,11 +659,6 @@ std::shared_ptr<KernelGraph> SessionBasic::ConstructKernelGraph(const FuncGraphP
       new_cnode->set_abstract(cnode->abstract());
       new_cnode->set_scope(cnode->scope());
       graph->FrontBackendlMapAdd(node, new_cnode);
-
-      // set original return to kernel_graph
-      if (IsPrimitive(new_cnode->input(kAnfPrimitiveIndex), prim::kPrimReturn)) {
-        graph->set_return(new_cnode);
-      }
     }
   }
 

mindspore/ccsrc/utils/utils.h

@@ -144,6 +144,7 @@ constexpr auto kBNInferGradOpName = "BNInferGrad";
 constexpr auto kCallOpName = "call";
 constexpr auto kPartialOpName = "partial";
 constexpr auto kSwitchOpName = "switch";
+constexpr auto kReturnOpName = "return";
 constexpr auto kLarsV2OpName = "LarsV2";
 constexpr auto kLarsV2UpdateOpName = "LarsV2Update";
 constexpr auto kSquareSumAllOpName = "SquareSumAll";