From 4776f8f499a6ad1532626bd87d41ffca2b462dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E6=99=93=E4=BC=9F?=
 <39303645+Shixiaowei02@users.noreply.github.com>
Date: Tue, 7 Jul 2020 19:01:06 +0800
Subject: [PATCH] cpp namespace alias, test=develop (#3894)

---
 lite/core/arena/framework.h                   |  2 +-
 .../remove_tf_redundant_ops_pass.cc           |  2 +-
 .../mir/subgraph/subgraph_detector_test.cc    |  2 +-
 lite/core/op_lite.h                           |  2 +-
 lite/core/program.cc                          |  4 +--
 lite/core/program.h                           |  2 +-
 lite/gen_code/gen_code.cc                     |  2 +-
 lite/gen_code/gen_code.h                      |  4 +--
 lite/gen_code/gen_code_test.cc                |  2 +-
 lite/model_parser/CMakeLists.txt              |  2 +-
 .../model_parser/{desc_apis.h => base/apis.h} |  0
 lite/model_parser/compatibility.cc            |  5 +---
 lite/model_parser/compatibility.h             |  2 +-
 lite/model_parser/compatibility_test.cc       |  5 +---
 lite/model_parser/compatible_pb.h             |  5 +---
 lite/model_parser/compatible_pb_test.cc       |  5 +---
 lite/model_parser/cpp_desc.h                  | 26 +++++++++++++++++++
 .../{cpp => general}/CMakeLists.txt           |  0
 .../{cpp => general}/block_desc.cc            |  6 ++---
 .../{cpp => general}/block_desc.h             | 13 +++++-----
 lite/model_parser/{cpp => general}/op_desc.cc |  6 ++---
 lite/model_parser/{cpp => general}/op_desc.h  |  8 +++---
 .../{cpp => general}/program_desc.cc          |  6 ++---
 .../{cpp => general}/program_desc.h           | 11 ++++----
 .../model_parser/{cpp => general}/var_desc.cc |  2 +-
 lite/model_parser/{cpp => general}/var_desc.h |  8 +++---
 lite/model_parser/model_parser.cc             |  2 +-
 lite/model_parser/naive_buffer/block_desc.h   |  2 +-
 .../naive_buffer/combined_params_desc.h       |  2 +-
 lite/model_parser/naive_buffer/op_desc.h      |  2 +-
 lite/model_parser/naive_buffer/param_desc.h   |  2 +-
 lite/model_parser/naive_buffer/program_desc.h |  2 +-
 lite/model_parser/naive_buffer/var_desc.h     |  2 +-
 lite/model_parser/pb/block_desc.h             |  2 +-
 lite/model_parser/pb/op_desc.h                |  2 +-
 lite/model_parser/pb/program_desc.h           |  2 +-
 lite/model_parser/pb/var_desc.h               |  2 +-
 lite/operators/op_params.h                    |  4 +--
 38 files changed, 86 insertions(+), 72 deletions(-)
 rename lite/model_parser/{desc_apis.h => base/apis.h} (100%)
 create mode 100644 lite/model_parser/cpp_desc.h
 rename lite/model_parser/{cpp => general}/CMakeLists.txt (100%)
 rename lite/model_parser/{cpp => general}/block_desc.cc (92%)
 rename lite/model_parser/{cpp => general}/block_desc.h (88%)
 rename lite/model_parser/{cpp => general}/op_desc.cc (95%)
 rename lite/model_parser/{cpp => general}/op_desc.h (96%)
 rename lite/model_parser/{cpp => general}/program_desc.cc (91%)
 rename lite/model_parser/{cpp => general}/program_desc.h (87%)
 rename lite/model_parser/{cpp => general}/var_desc.cc (92%)
 rename lite/model_parser/{cpp => general}/var_desc.h (91%)

diff --git a/lite/core/arena/framework.h b/lite/core/arena/framework.h
index 450be52154..4e73768e53 100644
--- a/lite/core/arena/framework.h
+++ b/lite/core/arena/framework.h
@@ -28,7 +28,7 @@
 #include "lite/core/program.h"
 #include "lite/core/scope.h"
 #include "lite/core/types.h"
-#include "lite/model_parser/cpp/op_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 
 namespace paddle {
 namespace lite {
diff --git a/lite/core/mir/elimination/remove_tf_redundant_ops_pass.cc b/lite/core/mir/elimination/remove_tf_redundant_ops_pass.cc
index f4226820d0..673854b118 100644
--- a/lite/core/mir/elimination/remove_tf_redundant_ops_pass.cc
+++ b/lite/core/mir/elimination/remove_tf_redundant_ops_pass.cc
@@ -18,7 +18,7 @@
 #include "lite/core/mir/pass.h"
 #include "lite/core/mir/pass_registry.h"
 #include "lite/core/mir/pattern_matcher.h"
-#include "lite/model_parser/cpp/var_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 
 namespace paddle {
 namespace lite {
diff --git a/lite/core/mir/subgraph/subgraph_detector_test.cc b/lite/core/mir/subgraph/subgraph_detector_test.cc
index f52c0332fa..06c9c4c78f 100644
--- a/lite/core/mir/subgraph/subgraph_detector_test.cc
+++ b/lite/core/mir/subgraph/subgraph_detector_test.cc
@@ -20,7 +20,7 @@
 #include "lite/api/paddle_use_passes.h"
 #include "lite/core/mir/ssa_graph.h"
 #include "lite/core/program.h"
-#include "lite/model_parser/cpp/program_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 #include "lite/model_parser/model_parser.h"
 
 DEFINE_string(model_dir, "", "model_dir");
diff --git a/lite/core/op_lite.h b/lite/core/op_lite.h
index c156388c9c..f9bbf8c1e9 100644
--- a/lite/core/op_lite.h
+++ b/lite/core/op_lite.h
@@ -24,7 +24,7 @@
 #include "lite/core/context.h"
 #include "lite/core/kernel.h"
 #include "lite/core/scope.h"
-#include "lite/model_parser/cpp/op_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 #include "lite/operators/op_params.h"
 
 namespace paddle {
diff --git a/lite/core/program.cc b/lite/core/program.cc
index 6dee8796ee..acda3a642d 100644
--- a/lite/core/program.cc
+++ b/lite/core/program.cc
@@ -15,9 +15,7 @@
 #include "lite/core/program.h"
 #include <algorithm>
 #include <map>
-#include "lite/model_parser/cpp/block_desc.h"
-#include "lite/model_parser/cpp/op_desc.h"
-#include "lite/model_parser/cpp/var_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 #include "lite/operators/conditional_block_op.h"
 #include "lite/operators/subgraph_op.h"
 #include "lite/operators/while_op.h"
diff --git a/lite/core/program.h b/lite/core/program.h
index c1cc6113d7..fb4265623a 100644
--- a/lite/core/program.h
+++ b/lite/core/program.h
@@ -22,7 +22,7 @@
 #include "lite/core/kernel.h"
 #include "lite/core/op_lite.h"
 #include "lite/core/op_registry.h"
-#include "lite/model_parser/cpp/program_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 #ifdef LITE_WITH_PROFILE
 #include "lite/core/profile/profiler.h"
 #endif
diff --git a/lite/gen_code/gen_code.cc b/lite/gen_code/gen_code.cc
index 6c43f6e011..a1e69b624a 100644
--- a/lite/gen_code/gen_code.cc
+++ b/lite/gen_code/gen_code.cc
@@ -59,7 +59,7 @@ void Module::AddHeaderIncludeGenCode() {
   Line("#include \"lite/gen_code/paddle_infer.h\"");
   Line("#include \"lite/core/op_registry.h\"");
   Line("#include \"lite/core/scope.h\"");
-  Line("#include \"lite/model_parser/cpp/op_desc.h\"");
+  Line("#include \"lite/model_parser/cpp_desc.h\"");
   Line("");
   Line("");
 }
diff --git a/lite/gen_code/gen_code.h b/lite/gen_code/gen_code.h
index d316eac43f..e100904a7f 100644
--- a/lite/gen_code/gen_code.h
+++ b/lite/gen_code/gen_code.h
@@ -20,9 +20,9 @@
 #include "lite/core/program.h"
 #include "lite/core/target_wrapper.h"
 #include "lite/core/tensor.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/model_parser/compatible_pb.h"
-#include "lite/model_parser/cpp/op_desc.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/cpp_desc.h"
 #include "lite/model_parser/pb/op_desc.h"
 #include "lite/utils/all.h"
 
diff --git a/lite/gen_code/gen_code_test.cc b/lite/gen_code/gen_code_test.cc
index d0b1c1f8b2..5b3db0de83 100644
--- a/lite/gen_code/gen_code_test.cc
+++ b/lite/gen_code/gen_code_test.cc
@@ -25,7 +25,7 @@
 #include "lite/core/scope.h"
 #include "lite/core/tensor.h"
 #include "lite/model_parser/compatible_pb.h"
-#include "lite/model_parser/cpp/op_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 #include "lite/model_parser/model_parser.h"
 #include "lite/model_parser/pb/program_desc.h"
 
diff --git a/lite/model_parser/CMakeLists.txt b/lite/model_parser/CMakeLists.txt
index 4e53b73886..a83cecf444 100644
--- a/lite/model_parser/CMakeLists.txt
+++ b/lite/model_parser/CMakeLists.txt
@@ -1,7 +1,7 @@
 if (NOT LITE_ON_TINY_PUBLISH)
     add_subdirectory(pb)
 endif()
-add_subdirectory(cpp)
+add_subdirectory(general)
 add_subdirectory(naive_buffer)
 add_subdirectory(flatbuffers)
 
diff --git a/lite/model_parser/desc_apis.h b/lite/model_parser/base/apis.h
similarity index 100%
rename from lite/model_parser/desc_apis.h
rename to lite/model_parser/base/apis.h
diff --git a/lite/model_parser/compatibility.cc b/lite/model_parser/compatibility.cc
index 67d7c9d691..dd43f7bd25 100644
--- a/lite/model_parser/compatibility.cc
+++ b/lite/model_parser/compatibility.cc
@@ -20,10 +20,7 @@
 #include "lite/model_parser/naive_buffer/program_desc.h"
 #include "lite/model_parser/naive_buffer/var_desc.h"
 #ifndef LITE_ON_TINY_PUBLISH
-#include "lite/model_parser/cpp/block_desc.h"
-#include "lite/model_parser/cpp/op_desc.h"
-#include "lite/model_parser/cpp/program_desc.h"
-#include "lite/model_parser/cpp/var_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 #endif
 
 namespace paddle {
diff --git a/lite/model_parser/compatibility.h b/lite/model_parser/compatibility.h
index 9e421d709d..a47870cf9c 100644
--- a/lite/model_parser/compatibility.h
+++ b/lite/model_parser/compatibility.h
@@ -17,7 +17,7 @@
 #include <set>
 #include <string>
 #include "lite/api/paddle_place.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 
 namespace paddle {
 namespace lite {
diff --git a/lite/model_parser/compatibility_test.cc b/lite/model_parser/compatibility_test.cc
index b3cb38f1c9..957bcb25ea 100644
--- a/lite/model_parser/compatibility_test.cc
+++ b/lite/model_parser/compatibility_test.cc
@@ -17,10 +17,7 @@
 #include "lite/api/paddle_lite_factory_helper.h"
 
 #include "lite/model_parser/compatible_pb.h"
-#include "lite/model_parser/cpp/block_desc.h"
-#include "lite/model_parser/cpp/op_desc.h"
-#include "lite/model_parser/cpp/program_desc.h"
-#include "lite/model_parser/cpp/var_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 
 USE_LITE_KERNEL(leaky_relu, kCUDA, kFloat, kNCHW, def);
 
diff --git a/lite/model_parser/compatible_pb.h b/lite/model_parser/compatible_pb.h
index 80fee49133..c9889a5879 100644
--- a/lite/model_parser/compatible_pb.h
+++ b/lite/model_parser/compatible_pb.h
@@ -21,10 +21,7 @@
  * lite::pb::XXDesc/lite::naive_buffer::XXDesc.
  */
 
-#include "lite/model_parser/cpp/block_desc.h"
-#include "lite/model_parser/cpp/op_desc.h"
-#include "lite/model_parser/cpp/program_desc.h"
-#include "lite/model_parser/cpp/var_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 
 namespace paddle {
 namespace lite {
diff --git a/lite/model_parser/compatible_pb_test.cc b/lite/model_parser/compatible_pb_test.cc
index 088b64bf2c..d9a46e4632 100644
--- a/lite/model_parser/compatible_pb_test.cc
+++ b/lite/model_parser/compatible_pb_test.cc
@@ -14,10 +14,7 @@
 
 #include "lite/model_parser/compatible_pb.h"
 #include <gtest/gtest.h>
-#include "lite/model_parser/cpp/block_desc.h"
-#include "lite/model_parser/cpp/op_desc.h"
-#include "lite/model_parser/cpp/program_desc.h"
-#include "lite/model_parser/cpp/var_desc.h"
+#include "lite/model_parser/cpp_desc.h"
 #include "lite/model_parser/naive_buffer/block_desc.h"
 #include "lite/model_parser/naive_buffer/op_desc.h"
 #include "lite/model_parser/naive_buffer/program_desc.h"
diff --git a/lite/model_parser/cpp_desc.h b/lite/model_parser/cpp_desc.h
new file mode 100644
index 0000000000..477f90a28d
--- /dev/null
+++ b/lite/model_parser/cpp_desc.h
@@ -0,0 +1,26 @@
+// Copyright (c) 2020 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include "lite/model_parser/general/block_desc.h"
+#include "lite/model_parser/general/op_desc.h"
+#include "lite/model_parser/general/program_desc.h"
+#include "lite/model_parser/general/var_desc.h"
+
+namespace paddle {
+namespace lite {
+namespace cpp = general;
+}
+}
diff --git a/lite/model_parser/cpp/CMakeLists.txt b/lite/model_parser/general/CMakeLists.txt
similarity index 100%
rename from lite/model_parser/cpp/CMakeLists.txt
rename to lite/model_parser/general/CMakeLists.txt
diff --git a/lite/model_parser/cpp/block_desc.cc b/lite/model_parser/general/block_desc.cc
similarity index 92%
rename from lite/model_parser/cpp/block_desc.cc
rename to lite/model_parser/general/block_desc.cc
index a4dc7cd72a..0766333d66 100644
--- a/lite/model_parser/cpp/block_desc.cc
+++ b/lite/model_parser/general/block_desc.cc
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/model_parser/cpp/block_desc.h"
+#include "lite/model_parser/general/block_desc.h"
 
 namespace paddle {
 namespace lite {
-namespace cpp {
+namespace general {
 
 template <>
 VarDesc* BlockDesc::GetVar<VarDesc>(int32_t idx) {
@@ -42,6 +42,6 @@ OpDesc* BlockDesc::AddOp<OpDesc>() {
   return &ops_.back();
 }
 
-}  // namespace cpp
+}  // namespace general
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/model_parser/cpp/block_desc.h b/lite/model_parser/general/block_desc.h
similarity index 88%
rename from lite/model_parser/cpp/block_desc.h
rename to lite/model_parser/general/block_desc.h
index a6cd714e60..3b1b1ff4e6 100644
--- a/lite/model_parser/cpp/block_desc.h
+++ b/lite/model_parser/general/block_desc.h
@@ -14,16 +14,17 @@
 
 #pragma once
 #include <vector>
-#include "lite/model_parser/cpp/op_desc.h"
-#include "lite/model_parser/cpp/var_desc.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
+#include "lite/model_parser/general/op_desc.h"
+#include "lite/model_parser/general/var_desc.h"
 
 namespace paddle {
 namespace lite {
-namespace cpp {
+namespace general {
 
 /*
- * The cpp::BlockDesc is the internal representation for Op. All the internal
+ * The general::BlockDesc is the internal representation for Op. All the
+ * internal
  * imprementation should use it, not the pb::BlockDesc.
  */
 class BlockDesc : public BlockDescAPI {
@@ -82,6 +83,6 @@ class BlockDesc : public BlockDescAPI {
   int32_t forward_block_idx_;
 };
 
-}  // namespace cpp
+}  // namespace general
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/model_parser/cpp/op_desc.cc b/lite/model_parser/general/op_desc.cc
similarity index 95%
rename from lite/model_parser/cpp/op_desc.cc
rename to lite/model_parser/general/op_desc.cc
index a816943bb9..b4589a14f2 100644
--- a/lite/model_parser/cpp/op_desc.cc
+++ b/lite/model_parser/general/op_desc.cc
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/model_parser/cpp/op_desc.h"
+#include "lite/model_parser/general/op_desc.h"
 #include <set>
 #include <utility>
 
 namespace paddle {
 namespace lite {
-namespace cpp {
+namespace general {
 
 std::vector<std::string> OpDesc::OutputArgumentNames() const {
   std::vector<std::string> res;
@@ -69,6 +69,6 @@ bool OpDesc::HasOutput(const std::string& param) const {
   return it != outputs_.end();
 }
 
-}  // namespace cpp
+}  // namespace general
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/model_parser/cpp/op_desc.h b/lite/model_parser/general/op_desc.h
similarity index 96%
rename from lite/model_parser/cpp/op_desc.h
rename to lite/model_parser/general/op_desc.h
index dfd60c0793..e0c2541182 100644
--- a/lite/model_parser/cpp/op_desc.h
+++ b/lite/model_parser/general/op_desc.h
@@ -17,16 +17,16 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/utils/any.h"
 #include "lite/utils/varient.h"
 
 namespace paddle {
 namespace lite {
-namespace cpp {
+namespace general {
 
 /*
- * The cpp::OpDesc is the internal representation for Op. All the internal
+ * The general::OpDesc is the internal representation for Op. All the internal
  * imprementation should use it, not the pb::OpDesc.
  */
 class OpDesc : public OpDescAPI {
@@ -131,6 +131,6 @@ class OpDesc : public OpDescAPI {
   }
 };
 
-}  // namespace cpp
+}  // namespace general
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/model_parser/cpp/program_desc.cc b/lite/model_parser/general/program_desc.cc
similarity index 91%
rename from lite/model_parser/cpp/program_desc.cc
rename to lite/model_parser/general/program_desc.cc
index 3c6adcddf3..670c768431 100644
--- a/lite/model_parser/cpp/program_desc.cc
+++ b/lite/model_parser/general/program_desc.cc
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/model_parser/cpp/program_desc.h"
+#include "lite/model_parser/general/program_desc.h"
 
 namespace paddle {
 namespace lite {
-namespace cpp {
+namespace general {
 
 template <>
 BlockDesc* ProgramDesc::GetBlock<BlockDesc>(int32_t idx) {
@@ -30,6 +30,6 @@ BlockDesc* ProgramDesc::AddBlock<BlockDesc>() {
   return &blocks_.back();
 }
 
-}  // namespace cpp
+}  // namespace general
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/model_parser/cpp/program_desc.h b/lite/model_parser/general/program_desc.h
similarity index 87%
rename from lite/model_parser/cpp/program_desc.h
rename to lite/model_parser/general/program_desc.h
index 63ac8e0d79..0fbc0742fe 100644
--- a/lite/model_parser/cpp/program_desc.h
+++ b/lite/model_parser/general/program_desc.h
@@ -14,15 +14,16 @@
 
 #pragma once
 #include <vector>
-#include "lite/model_parser/cpp/block_desc.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
+#include "lite/model_parser/general/block_desc.h"
 
 namespace paddle {
 namespace lite {
-namespace cpp {
+namespace general {
 
 /*
- * The cpp::ProgramDesc is the internal representation for Op. All the internal
+ * The general::ProgramDesc is the internal representation for Op. All the
+ * internal
  * imprementation should use it, not the pb::ProgramDesc.
  */
 class ProgramDesc : public ProgramDescAPI {
@@ -59,6 +60,6 @@ class ProgramDesc : public ProgramDescAPI {
   std::vector<BlockDesc> blocks_;
 };
 
-}  // namespace cpp
+}  // namespace general
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/model_parser/cpp/var_desc.cc b/lite/model_parser/general/var_desc.cc
similarity index 92%
rename from lite/model_parser/cpp/var_desc.cc
rename to lite/model_parser/general/var_desc.cc
index e30bb3eb55..f2782d1778 100644
--- a/lite/model_parser/cpp/var_desc.cc
+++ b/lite/model_parser/general/var_desc.cc
@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/model_parser/cpp/var_desc.h"
+#include "lite/model_parser/general/var_desc.h"
diff --git a/lite/model_parser/cpp/var_desc.h b/lite/model_parser/general/var_desc.h
similarity index 91%
rename from lite/model_parser/cpp/var_desc.h
rename to lite/model_parser/general/var_desc.h
index c56d7cce53..ed69d035df 100644
--- a/lite/model_parser/cpp/var_desc.h
+++ b/lite/model_parser/general/var_desc.h
@@ -15,14 +15,14 @@
 #pragma once
 #include <string>
 #include <vector>
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 
 namespace paddle {
 namespace lite {
-namespace cpp {
+namespace general {
 
 /*
- * The cpp::VarDesc is the internal representation for Op. All the internal
+ * The general::VarDesc is the internal representation for Op. All the internal
  * imprementation should use it, not the pb::VarDesc.
  */
 class VarDesc : public VarDescAPI {
@@ -59,6 +59,6 @@ class VarDesc : public VarDescAPI {
   std::vector<int64_t> shape_;
 };
 
-}  // namespace cpp
+}  // namespace general
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/model_parser/model_parser.cc b/lite/model_parser/model_parser.cc
index ea94ca52e8..640dd04417 100644
--- a/lite/model_parser/model_parser.cc
+++ b/lite/model_parser/model_parser.cc
@@ -21,7 +21,7 @@
 #include "lite/core/tensor.h"
 #include "lite/core/variable.h"
 #include "lite/core/version.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/model_parser/naive_buffer/combined_params_desc.h"
 #include "lite/model_parser/naive_buffer/param_desc.h"
 #include "lite/model_parser/naive_buffer/program_desc.h"
diff --git a/lite/model_parser/naive_buffer/block_desc.h b/lite/model_parser/naive_buffer/block_desc.h
index ea4a779fb1..61c624d959 100644
--- a/lite/model_parser/naive_buffer/block_desc.h
+++ b/lite/model_parser/naive_buffer/block_desc.h
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/model_parser/naive_buffer/proto/framework.nb.h"
 
 namespace paddle {
diff --git a/lite/model_parser/naive_buffer/combined_params_desc.h b/lite/model_parser/naive_buffer/combined_params_desc.h
index a5462ef5ee..1131bab961 100644
--- a/lite/model_parser/naive_buffer/combined_params_desc.h
+++ b/lite/model_parser/naive_buffer/combined_params_desc.h
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/model_parser/naive_buffer/param_desc.h"
 #include "lite/model_parser/naive_buffer/proto/framework.nb.h"
 
diff --git a/lite/model_parser/naive_buffer/op_desc.h b/lite/model_parser/naive_buffer/op_desc.h
index cce0c22c2e..f4cd2d8578 100644
--- a/lite/model_parser/naive_buffer/op_desc.h
+++ b/lite/model_parser/naive_buffer/op_desc.h
@@ -23,7 +23,7 @@
 #include <set>
 #include <string>
 #include <vector>
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/model_parser/naive_buffer/proto/framework.nb.h"
 
 namespace paddle {
diff --git a/lite/model_parser/naive_buffer/param_desc.h b/lite/model_parser/naive_buffer/param_desc.h
index 0a20b15331..ebbbdaf846 100644
--- a/lite/model_parser/naive_buffer/param_desc.h
+++ b/lite/model_parser/naive_buffer/param_desc.h
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/model_parser/naive_buffer/proto/framework.nb.h"
 
 namespace paddle {
diff --git a/lite/model_parser/naive_buffer/program_desc.h b/lite/model_parser/naive_buffer/program_desc.h
index d3926b7c62..1552b6bcdd 100644
--- a/lite/model_parser/naive_buffer/program_desc.h
+++ b/lite/model_parser/naive_buffer/program_desc.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include <vector>
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/model_parser/naive_buffer/proto/framework.nb.h"
 
 namespace paddle {
diff --git a/lite/model_parser/naive_buffer/var_desc.h b/lite/model_parser/naive_buffer/var_desc.h
index bf0845d746..20c8e03a54 100644
--- a/lite/model_parser/naive_buffer/var_desc.h
+++ b/lite/model_parser/naive_buffer/var_desc.h
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/model_parser/naive_buffer/naive_buffer_wrapper_helper.h"
 #include "lite/model_parser/naive_buffer/proto/framework.nb.h"
 
diff --git a/lite/model_parser/pb/block_desc.h b/lite/model_parser/pb/block_desc.h
index 2a34a51f68..8844173798 100644
--- a/lite/model_parser/pb/block_desc.h
+++ b/lite/model_parser/pb/block_desc.h
@@ -16,7 +16,7 @@
 
 #include <vector>
 #include "lite/core/framework.pb.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/utils/cp_logging.h"
 
 namespace paddle {
diff --git a/lite/model_parser/pb/op_desc.h b/lite/model_parser/pb/op_desc.h
index f21c194a27..6f186e7782 100644
--- a/lite/model_parser/pb/op_desc.h
+++ b/lite/model_parser/pb/op_desc.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <vector>
 #include "lite/core/framework.pb.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/utils/all.h"
 
 namespace paddle {
diff --git a/lite/model_parser/pb/program_desc.h b/lite/model_parser/pb/program_desc.h
index 9ff4c28a6d..950bf5480d 100644
--- a/lite/model_parser/pb/program_desc.h
+++ b/lite/model_parser/pb/program_desc.h
@@ -16,7 +16,7 @@
 
 #include <vector>
 #include "lite/core/framework.pb.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/utils/cp_logging.h"
 
 namespace paddle {
diff --git a/lite/model_parser/pb/var_desc.h b/lite/model_parser/pb/var_desc.h
index eefacef4b0..d36881d589 100644
--- a/lite/model_parser/pb/var_desc.h
+++ b/lite/model_parser/pb/var_desc.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 #include "lite/core/framework.pb.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
 #include "lite/utils/cp_logging.h"
 
 namespace paddle {
diff --git a/lite/operators/op_params.h b/lite/operators/op_params.h
index 376f5c107d..f6fffeff65 100644
--- a/lite/operators/op_params.h
+++ b/lite/operators/op_params.h
@@ -21,8 +21,8 @@
 #include "lite/core/scope.h"
 #include "lite/core/tensor.h"
 #include "lite/core/types.h"
-#include "lite/model_parser/cpp/block_desc.h"
-#include "lite/model_parser/desc_apis.h"
+#include "lite/model_parser/base/apis.h"
+#include "lite/model_parser/cpp_desc.h"
 #include "lite/utils/all.h"
 /*
  * This file contains all the argument parameter data structure for operators.
-- 
GitLab