From 2e68abf47c8a6402beeb11bafbae3bb7005ae052 Mon Sep 17 00:00:00 2001
From: Luo Tao <luotao02@baidu.com>
Date: Wed, 18 Jul 2018 11:24:24 +0800
Subject: [PATCH] rename api.h to paddle_inference_api.h, put demo_ci in
 fluid_install_dir

---
 cmake/inference_lib.cmake                                   | 6 ++++--
 paddle/fluid/inference/api/api.cc                           | 2 +-
 paddle/fluid/inference/api/api_anakin_engine.h              | 2 +-
 paddle/fluid/inference/api/api_anakin_engine_tester.cc      | 2 +-
 paddle/fluid/inference/api/api_impl.h                       | 2 +-
 paddle/fluid/inference/api/api_tensorrt_subgraph_engine.cc  | 2 +-
 paddle/fluid/inference/api/demo_ci/simple_on_word2vec.cc    | 2 +-
 paddle/fluid/inference/api/demo_ci/utils.h                  | 2 +-
 .../fluid/inference/api/{api.h => paddle_inference_api.h}   | 0
 paddle/fluid/inference/api/test_api.cc                      | 2 +-
 .../inference/api/test_api_tensorrt_subgraph_engine.cc      | 2 +-
 11 files changed, 13 insertions(+), 11 deletions(-)
 rename paddle/fluid/inference/api/{api.h => paddle_inference_api.h} (100%)

diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake
index 2fe474fd2eb..e2c58cd5605 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 c6b228b3ef5..e74f23ff969 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 0b7de8877ae..85ca83cd007 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 <vector>
-#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 94c828a9d87..d6d631bfbad 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 <glog/logging.h>
 #include <gtest/gtest.h>
 
-#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 5dbcb26d21b..92e693578ab 100644
--- a/paddle/fluid/inference/api/api_impl.h
+++ b/paddle/fluid/inference/api/api_impl.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#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 6d5de1a98bb..0cdc88fa1ea 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 ecf4a3a7985..5f96fecf93f 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 <glog/logging.h>
 #include <memory>
 #include <thread>  //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 7298b969ff1..cb899067116 100644
--- a/paddle/fluid/inference/api/demo_ci/utils.h
+++ b/paddle/fluid/inference/api/demo_ci/utils.h
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#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 03b5e8dacdc..ac8a21a22be 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 <glog/logging.h>
 #include <gtest/gtest.h>
-#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 2e26781a7bc..585f6d29376 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 <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
-#include "paddle/fluid/inference/api/api.h"
+#include "paddle/fluid/inference/api/paddle_inference_api.h"
 
 namespace paddle {
 
-- 
GitLab