diff --git a/lite/core/arena/framework.h b/lite/core/arena/framework.h index 450be521540eae9a3eee5e5cf7fb47c95af929e0..4e73768e53576f03e47158618fa4f0eac0851382 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 f4226820d0437db8cad0cfdac92be15359bb90bd..673854b118a8adaca73cb905eda4892b6903665c 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 f52c0332fa3cfce904d2b7c8bf010bc3d3ac6ac9..06c9c4c78fedba7cfabcd4ff2dd3804b404f966d 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 c156388c9c63e7f2d86a5ea704b38a0047f6e7ad..f9bbf8c1e9a5da59e97bd3e1689a868241df20b8 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 6dee8796ee1dcd944940f41cb9454344fb8367a7..acda3a642d44361c71860469d0901fe512aedb6f 100644 --- a/lite/core/program.cc +++ b/lite/core/program.cc @@ -15,9 +15,7 @@ #include "lite/core/program.h" #include #include -#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 c1cc6113d747a134a3ffbdc7291273db2b275ef8..fb4265623af3d423821d0b60b5ea93bdc2b7115b 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 6c43f6e0116d9adfc4fc6f315d5653b2634dfe7b..a1e69b624a600719121926fc3a4f58391fa63ce6 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 d316eac43f99664fa71cba54b3ab5360852300a0..e100904a7fe4f9c3e489c056ceeeba21657b4944 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 d0b1c1f8b23f90976f4b315a1a4e13069b2136f1..5b3db0de8342f312dcb4443ebcd1fd72e857eea0 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 4e53b73886163e8764badfc4b4c1740ef48bb014..a83cecf4444910e710d0eb92b9c3449190f5bda2 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 67d7c9d69152d31d1381ea847ef859a08e4f82a7..dd43f7bd25277e34a2fd8b04aae6b705402a0436 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 9e421d709d1823852d6dac5cd0070b4330f56752..a47870cf9c4d8e1743f2eb749823e88f18b33900 100644 --- a/lite/model_parser/compatibility.h +++ b/lite/model_parser/compatibility.h @@ -17,7 +17,7 @@ #include #include #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 b3cb38f1c95649567b72d73b8938420537ec7b5b..957bcb25ea68b5555c9937de4e87dc8e9c4923b1 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 80fee49133130b09fbdd490ed86dce0af924aac1..c9889a5879160dd60ec64c4806df8af888db99c9 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 088b64bf2cd13ce0f443f962bd2cb5f709c4d4f2..d9a46e463209eb33e6f2cb53f4644056f88e7085 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 -#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 0000000000000000000000000000000000000000..477f90a28d7bf1e31dbc648b18af42381e0c93d6 --- /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 a4dc7cd72acacb6392cecdfe9a551773c1937888..0766333d66c1299b738098a33a1a2c6433782337 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(int32_t idx) { @@ -42,6 +42,6 @@ OpDesc* BlockDesc::AddOp() { 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 a6cd714e60a66398bffb5ed05a3d7d7eb1da9ac2..3b1b1ff4e6616c936bd3b09bff563656f6bdbc6a 100644 --- a/lite/model_parser/cpp/block_desc.h +++ b/lite/model_parser/general/block_desc.h @@ -14,16 +14,17 @@ #pragma once #include -#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 a816943bb9689483f1eb60575147a42594db2654..b4589a14f26b641a0e48c69ec067cd847649b67e 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 #include namespace paddle { namespace lite { -namespace cpp { +namespace general { std::vector OpDesc::OutputArgumentNames() const { std::vector 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 dfd60c0793af650ede4327bc37f5dccac2e9ee67..e0c2541182adde6ab9171a55d859a5bd5a1195e2 100644 --- a/lite/model_parser/cpp/op_desc.h +++ b/lite/model_parser/general/op_desc.h @@ -17,16 +17,16 @@ #include #include #include -#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 3c6adcddf319db57366e5b3cdb05bc6169f229ee..670c7684312265d5a1f1eb2cbef54ed5fe62b2d2 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(int32_t idx) { @@ -30,6 +30,6 @@ BlockDesc* ProgramDesc::AddBlock() { 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 63ac8e0d79c16ea6e64daa4a0b1922a3350037cc..0fbc0742fe149075d3ede2b688fd071727baafc9 100644 --- a/lite/model_parser/cpp/program_desc.h +++ b/lite/model_parser/general/program_desc.h @@ -14,15 +14,16 @@ #pragma once #include -#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 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 e30bb3eb55d274d5287702d6247b94d5d33c4e74..f2782d1778b07ef201401a62f9c7a6295159ef5f 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 c56d7cce53180e0157913372f8b0da4c9cedd8c9..ed69d035dfbe837afa79a3f52bd2c0c925bd19ea 100644 --- a/lite/model_parser/cpp/var_desc.h +++ b/lite/model_parser/general/var_desc.h @@ -15,14 +15,14 @@ #pragma once #include #include -#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 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 ea94ca52e8f123da5077f3b751ab03b857e8c390..640dd044174c831e4570c5e8cc81af02fa50f0c4 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 ea4a779fb17559d3487c07b60bd18020fc0e9cce..61c624d9593244a3e680b5541e32cd4aeee949d5 100644 --- a/lite/model_parser/naive_buffer/block_desc.h +++ b/lite/model_parser/naive_buffer/block_desc.h @@ -17,7 +17,7 @@ #include #include #include -#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 a5462ef5eea47867a737cd1eff344c696f9dc159..1131bab9615b53055d58ba962ad21e206ee70bfc 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 #include #include -#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 cce0c22c2e717b6d622314f31af2dc418503c78b..f4cd2d8578cf69854fc4044b739fdfa3d6516d50 100644 --- a/lite/model_parser/naive_buffer/op_desc.h +++ b/lite/model_parser/naive_buffer/op_desc.h @@ -23,7 +23,7 @@ #include #include #include -#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 0a20b153312d99602ada77317e64c5934df0f070..ebbbdaf846a3550015ec97c11ccfb7d34271b6c5 100644 --- a/lite/model_parser/naive_buffer/param_desc.h +++ b/lite/model_parser/naive_buffer/param_desc.h @@ -17,7 +17,7 @@ #include #include #include -#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 d3926b7c629c4bf56d104ca12c1fc70fbf3c0387..1552b6bcdd7ea7f8efd3954e2625712a7684a5f2 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 -#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 bf0845d7464f511dfb77812612c2b99c954600da..20c8e03a5433ba98c8dc3d98af25920a934ee31d 100644 --- a/lite/model_parser/naive_buffer/var_desc.h +++ b/lite/model_parser/naive_buffer/var_desc.h @@ -17,7 +17,7 @@ #include #include #include -#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 2a34a51f686caab7aed6a9fb64bb405cd64a2d71..8844173798dcacf77c876f717b71c87cbc57e5e6 100644 --- a/lite/model_parser/pb/block_desc.h +++ b/lite/model_parser/pb/block_desc.h @@ -16,7 +16,7 @@ #include #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 f21c194a271b46c84b3a363c6f7c0d9c1f7b1f32..6f186e778298a5ae59a63188640725b3ae5322c9 100644 --- a/lite/model_parser/pb/op_desc.h +++ b/lite/model_parser/pb/op_desc.h @@ -26,7 +26,7 @@ #include #include #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 9ff4c28a6d9adce85950bb7e83f15004d766d2dc..950bf5480db501289250ece88b28d1c1369e56fc 100644 --- a/lite/model_parser/pb/program_desc.h +++ b/lite/model_parser/pb/program_desc.h @@ -16,7 +16,7 @@ #include #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 eefacef4b0c90faf132b2e4ef141ac7009939db5..d36881d5892ca8b4bef754554d164409fab4b858 100644 --- a/lite/model_parser/pb/var_desc.h +++ b/lite/model_parser/pb/var_desc.h @@ -18,7 +18,7 @@ #include #include #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 376f5c107d7c168c0d24c5269750ea6aad8f287d..f6fffeff65335f39f48a69459fb6d16f4a697306 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.