update from upstream

Author: wzzju

paddle/fluid/lite/core/mir/CMakeLists.txt

@@ -55,4 +55,4 @@ cc_test(test_pattern_matcher_lite SRCS pattern_matcher_tester.cc DEPS pattern_ma
 cc_library(pattern_matcher_high_api SRCS pattern_matcher_high_api.cc DEPS pattern_matcher_lite)
 cc_test(test_pattern_matcher_high_api SRCS pattern_matcher_high_api_test.cc DEPS
     pattern_matcher_high_api proto_desc mir_pass_manager fc_op_lite mul_op_lite elementwise_ops_lite
-    mir_passes compatible_pb_lite ${ops_lite})
+    mir_passes compatible_pb_lite model_parser_lite program_lite ${ops_lite})

paddle/fluid/lite/core/mir/pattern_matcher_high_api_test.cc

@@ -19,6 +19,8 @@
 #include "paddle/fluid/lite/core/compatible_tensor.h"
 #include "paddle/fluid/lite/core/mir/graph_visualize_pass.h"
 #include "paddle/fluid/lite/core/mir/pattern_matcher_high_api.h"
+#include "paddle/fluid/lite/core/program.h"
+#include "paddle/fluid/lite/model_parser/model_parser.h"
 
 namespace paddle {
 namespace lite {
@@ -128,7 +130,7 @@ TEST(pattern_matcher2, graph_test) {
   auto scope = std::make_shared<Scope>();
   auto graph = BuildGraph(&program_desc, scope, places);
 
-  ASSERT_EQ(graph->nodes().size(), 9UL);
+  ASSERT_EQ(graph->nodes().size(), 8UL + 2UL /*feed op + fetch op*/);
   Visualize(graph.get());
 }
 
@@ -139,7 +141,8 @@ TEST(pattern_matcher2, test) {
   auto graph = BuildGraph(&program_desc, scope, places);
   FcFuser fuser;
   fuser(graph.get());
-  ASSERT_EQ(graph->nodes().size(), 9 - 3 + 1);
+  ASSERT_EQ(graph->nodes().size(),
+            8UL - 3UL /*mul_out, mul, add */ + 1UL /* fc*/);
 }
 
 }  // namespace mir

paddle/fluid/lite/core/mir/ssa_graph.cc

@@ -139,7 +139,7 @@ void SSAGraph::Build(const Program &program,
   GraphCreateWeightVarNodes(program);
   CHECK(CheckNodesRoleSet());
 
-  for (auto &op : program.ops) {
+  for (auto &op : program.ops()) {
     auto *op_node = GraphCreateInstructNode(op, valid_places);
     for (const std::string &name : op->op_info()->input_names()) {
       auto *arg = Argument(name);