diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index 2fe474fd2eb80cbb0d9ffdcaeed01dbd956d3c58..e2c58cd56055455e7fedc598ca8f56183d4b51dc 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -149,8 +149,10 @@ if (WITH_ANAKIN AND WITH_GPU) endif() copy(inference_api_lib DEPS paddle_inference_api paddle_inference_api_shared - SRCS ${src_dir}/${module}/api.h ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/libpaddle_inference_api* - DSTS ${dst_dir}/inference ${dst_dir}/inference + SRCS ${src_dir}/${module}/paddle_inference_api.h + ${src_dir}/${module}/demo_ci + ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/libpaddle_inference_api* + DSTS ${dst_dir}/inference ${dst_dir}/inference ${dst_dir}/inference ) list(APPEND inference_deps inference_api_lib) diff --git a/paddle/fluid/inference/api/api.cc b/paddle/fluid/inference/api/api.cc index c6b228b3ef5e0808a51be9eb85fcc17bed10e404..e74f23ff969f5a8f58a71da337c16dcbc14f10c0 100644 --- a/paddle/fluid/inference/api/api.cc +++ b/paddle/fluid/inference/api/api.cc @@ -12,7 +12,7 @@ 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. */ -#include "paddle/fluid/inference/api/api.h" +#include "paddle/fluid/inference/api/paddle_inference_api.h" namespace paddle { diff --git a/paddle/fluid/inference/api/api_anakin_engine.h b/paddle/fluid/inference/api/api_anakin_engine.h index 0b7de8877ae12d7a081e0b02668b6e047e1a5ba6..85ca83cd00756cca04d7b92437e9955d8ab297e7 100644 --- a/paddle/fluid/inference/api/api_anakin_engine.h +++ b/paddle/fluid/inference/api/api_anakin_engine.h @@ -20,7 +20,7 @@ limitations under the License. */ #pragma once #include -#include "paddle/fluid/inference/api/api.h" +#include "paddle/fluid/inference/api/paddle_inference_api.h" // from anakin #include "framework/core/net/net.h" diff --git a/paddle/fluid/inference/api/api_anakin_engine_tester.cc b/paddle/fluid/inference/api/api_anakin_engine_tester.cc index 94c828a9d874c46131b7d9933f2136f4b9c5d48a..d6d631bfbad4278fe99e4553a410a9d9162dcc7b 100644 --- a/paddle/fluid/inference/api/api_anakin_engine_tester.cc +++ b/paddle/fluid/inference/api/api_anakin_engine_tester.cc @@ -16,7 +16,7 @@ limitations under the License. */ #include #include -#include "paddle/fluid/inference/api/api.h" +#include "paddle/fluid/inference/api/paddle_inference_api.h" DEFINE_string(model, "", "Directory of the inference model."); diff --git a/paddle/fluid/inference/api/api_impl.h b/paddle/fluid/inference/api/api_impl.h index 5dbcb26d21b675740e80f00f1feb2642d11f3a3a..92e693578ab657004f3c40c09b979897afea1e1f 100644 --- a/paddle/fluid/inference/api/api_impl.h +++ b/paddle/fluid/inference/api/api_impl.h @@ -19,7 +19,7 @@ #include #include -#include "paddle/fluid/inference/api/api.h" +#include "paddle/fluid/inference/api/paddle_inference_api.h" #include "paddle/fluid/framework/ddim.h" #include "paddle/fluid/framework/lod_tensor.h" diff --git a/paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc b/paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc index 6d5de1a98bb61801725fd1b7b5f7e965d8e225de..0cdc88fa1eaf3935ce0da143e1e91eb84cd70dcf 100644 --- a/paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc +++ b/paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/inference/api/api.h" #include "paddle/fluid/inference/analysis/analyzer.h" #include "paddle/fluid/inference/api/api_impl.h" +#include "paddle/fluid/inference/api/paddle_inference_api.h" #include "paddle/fluid/inference/utils/singleton.h" namespace paddle { diff --git a/paddle/fluid/inference/api/demo_ci/simple_on_word2vec.cc b/paddle/fluid/inference/api/demo_ci/simple_on_word2vec.cc index ecf4a3a7985e30b4c9d376120dc7ce707eaeb49b..5f96fecf93f7a6c42bc6b9fe4e0d985c626388d7 100644 --- a/paddle/fluid/inference/api/demo_ci/simple_on_word2vec.cc +++ b/paddle/fluid/inference/api/demo_ci/simple_on_word2vec.cc @@ -20,7 +20,7 @@ limitations under the License. */ #include #include #include //NOLINT -#include "paddle/fluid/inference/api.h" +#include "paddle/fluid/inference/paddle_inference_api.h" #include "paddle/fluid/platform/enforce.h" DEFINE_string(dirname, "", "Directory of the inference model."); diff --git a/paddle/fluid/inference/api/demo_ci/utils.h b/paddle/fluid/inference/api/demo_ci/utils.h index 7298b969ff1ed1898fb119fbd12e36dcb9de4234..cb8990671162dff47228736e69617229528cc093 100644 --- a/paddle/fluid/inference/api/demo_ci/utils.h +++ b/paddle/fluid/inference/api/demo_ci/utils.h @@ -16,7 +16,7 @@ #include #include #include -#include "paddle/fluid/inference/api.h" +#include "paddle/fluid/inference/paddle_inference_api.h" namespace paddle { namespace demo { diff --git a/paddle/fluid/inference/api/api.h b/paddle/fluid/inference/api/paddle_inference_api.h similarity index 100% rename from paddle/fluid/inference/api/api.h rename to paddle/fluid/inference/api/paddle_inference_api.h diff --git a/paddle/fluid/inference/api/test_api.cc b/paddle/fluid/inference/api/test_api.cc index 03b5e8dacdca35ad4c237f89b112c52ba25fb335..ac8a21a22be6f27311b8ae2507d04d9d1b510e76 100644 --- a/paddle/fluid/inference/api/test_api.cc +++ b/paddle/fluid/inference/api/test_api.cc @@ -14,7 +14,7 @@ limitations under the License. */ #include #include -#include "paddle/fluid/inference/api/api.h" +#include "paddle/fluid/inference/api/paddle_inference_api.h" namespace paddle { diff --git a/paddle/fluid/inference/api/test_api_tensorrt_subgraph_engine.cc b/paddle/fluid/inference/api/test_api_tensorrt_subgraph_engine.cc index 2e26781a7bce111830c99c2cd44c93a596e253a2..585f6d29376c3341c21ff76361d5335512c1b1b6 100644 --- a/paddle/fluid/inference/api/test_api_tensorrt_subgraph_engine.cc +++ b/paddle/fluid/inference/api/test_api_tensorrt_subgraph_engine.cc @@ -15,7 +15,7 @@ #include #include #include -#include "paddle/fluid/inference/api/api.h" +#include "paddle/fluid/inference/api/paddle_inference_api.h" namespace paddle {