Clean cinn_launch [fluid_ops](#68355)

co63oc · web-flow · commit 9e4e5d39837e · 2024-09-23T19:13:06.000+08:00
diff --git a/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc b/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc
@@ -752,17 +752,6 @@ void BuildOpFuncList(const phi::Place& place,
         VLOG(4) << "get RuntimeContext";
 
         Scope scope, *runtime_scope = &scope;
-        // NOTE(Ruibiao): We do not encourage directly using scope in OP kernel.
-        // But some OPs do have such behavior (e.g., cinn_launch OP). Here
-        // special treatment for them.
-        if (op_with_kernel->Type() == "cinn_launch" ||
-            op_with_kernel->Type() == "cinn_instruction_run") {
-          VLOG(6) << "OP(" << op_with_kernel->Type()
-                  << ") use scope in kernel, "
-                     "so pass a real scope to "
-                     "ExecutionContext";
-          runtime_scope = local_scope;
-        }
 
         // construct the device context
         auto* dev_ctx = ConstructDeviceContext(op, place);
diff --git a/paddle/fluid/framework/new_executor/interpreter/static_build.cc b/paddle/fluid/framework/new_executor/interpreter/static_build.cc
@@ -57,9 +57,6 @@ std::set<std::string> OpsCanSkipedFakeAllocInStaticBuild = {
     "nop"};
 
 std::set<std::string> StaticBuildBlackList = {
-    "cinn_instruction_run" /*: to handle subgraph infermeta*/,
-    "cinn_launch" /*: to handle subgraph infermeta*/,
-    "run_program" /*: to handle scope output*/,
     "sparse_sparse_coo_tensor" /*: to handle sparse output*/,
     "distributed_fused_lamb_init"};
 
diff --git a/paddle/fluid/framework/new_executor/program_interpreter.cc b/paddle/fluid/framework/new_executor/program_interpreter.cc
@@ -458,17 +458,7 @@ void ProgramInterpreter::BuildAndCacheInstructionCtx(Instruction* instr_node) {
     outs_map.emplace(var_name_item.first, std::move(out_vars));
   }
 
-  // set runtime_ctx and infershape_ctx_
-  if (instr_node->OpBase()->Type() == "cinn_launch" ||
-      instr_node->OpBase()->Type() == "cinn_instruction_run") {  // OP use scope
-                                                                 // in kernel
-    Scope* local_scope = HasLocalScope() ? var_scope_.GetMutableLocalScope()
-                                         : var_scope_.GetMutableScope();
-    instr_node->ResetContextWithScope(
-        ins_map, outs_map, *local_scope, instr_node->OpBase()->Type());
-  } else {
-    instr_node->ResetContext(ins_map, outs_map, instr_node->OpBase()->Type());
-  }
+  instr_node->ResetContext(ins_map, outs_map, instr_node->OpBase()->Type());
 }
 
 void ProgramInterpreter::BuildInplace() {
