Add cond op in unittest.

Author: huangxu96

paddle/fluid/framework/program_processing.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
+/* Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,12 +29,12 @@ bool ProgramProcessor::IsControlFlowBlock(ProgramDesc *program,
           inner_inputs.end())
         inner_inputs.push_back(iname);
   }
-  BlockDesc parent_block = program->Block(current_block.Parent());
   for (auto in_var_name : inner_inputs) {
-    VarDesc *parent_block_var = parent_block.FindVarRecursive(in_var_name);
+    VarDesc *parent_block_var =
+        program->Block(current_block.Parent()).FindVarRecursive(in_var_name);
     VarDesc *current_block_var;
     if (current_block.HasVar(in_var_name)) {
-      current_block_var = current_block.Var(in_var_name);
+      current_block_var = current_block.FindVar(in_var_name);
     }
     if (parent_block_var == nullptr && current_block_var)
       removed_inner_inputs.push_back(in_var_name);
@@ -51,6 +51,8 @@ void ProgramProcessor::SSAProgram(ProgramDesc *program) {
     if (IsControlFlowBlock(program, program->Block(i))) {
       VLOG(3) << "Block ID with whlie op:" << program->Block(i).ID();
       // ssa_processing(program, cur_block);
+    } else {
+      VLOG(3) << "Not a ControlFlow Block";
     }
   }
 }

paddle/fluid/framework/program_processing.h

@@ -32,7 +32,7 @@ class ProgramProcessor {
 
   // explicit ProgramProcessor(const ProgramDesc &program);
 
-  bool IsControlFlowBlock(ProgramDesc *program, BlockDesc *current_block);
+  bool IsControlFlowBlock(ProgramDesc *program, const BlockDesc &current_block);
 
   void SSAProgram(ProgramDesc *program);
 };

paddle/fluid/framework/program_processing_test.cc

@@ -61,6 +61,34 @@ TEST(ProgramDesc, SSAprogram) {
   VLOG(3) << "sub_blocks_Parent:" << sub_blocks[0]->Parent();
   op->SetAttr("sub_blocks", sub_blocks);
 
+  // building cond op such as less_than
+  BlockDesc* parent_block = program.MutableBlock(sub_blocks[0]->Parent());
+  op = parent_block->AppendOp();
+  op->SetType("less_than");
+  auto* x = parent_block->Var("X");
+  x->SetType(proto::VarType::LOD_TENSOR);
+  x->SetLoDLevel(0);
+  x->SetDataType(proto::VarType::FP32);
+  x->SetShape({1});
+
+  auto* y = parent_block->Var("Y");
+  y->SetType(proto::VarType::LOD_TENSOR);
+  y->SetLoDLevel(0);
+  y->SetDataType(proto::VarType::FP32);
+  y->SetShape({1});
+
+  op->SetInput("X", {x->Name()});
+  op->SetInput("Y", {y->Name()});
+
+  auto* out = parent_block->Var("Out");
+  out->SetType(proto::VarType::BOOL);
+  op->SetOutput("Out", {out->Name()});
+
+  // building while op
+  // BlockDesc* parent_block = program.MutableBlock(sub_blocks[0]->Parent());
+  op = parent_block->AppendOp();
+  op->SetType("while");
+
   ProgramProcessor program_processor;
   program_processor.SSAProgram(&program);
 }