Fix include paths

Change-Id: Ib89b0dd2c8048f74cc08117bc344d7b821906b8a

configure/CMakeLists.txt

@@ -11,16 +11,9 @@ list(APPEND configure_srcs ${CMAKE_CURRENT_LIST_DIR}/src/configure_parser.cpp)
 
 add_library(configure ${configure_srcs})
 add_dependencies(configure brpc)
-target_include_directories(configure PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/
-        )
 
 add_executable(test_configure
         ${CMAKE_CURRENT_LIST_DIR}/tests/test_configure.cpp)
-target_include_directories(test_configure PUBLIC
-        ${CMAKE_CURRENT_BINARY_DIR}/
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        )
 target_link_libraries(test_configure configure protobuf)
 
 install(TARGETS configure 

configure/src/configure_parser.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "include/configure_parser.h"
+#include "configure/include/configure_parser.h"
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>

configure/tests/test_configure.cpp

@@ -16,10 +16,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <iostream>
+#include "configure/include/configure_parser.h"
 #include "configure/inferencer_configure.pb.h"
 #include "configure/sdk_configure.pb.h"
 #include "configure/server_configure.pb.h"
-#include "include/configure_parser.h"
 
 using baidu::paddle_serving::configure::EngineDesc;
 using baidu::paddle_serving::configure::ModelToolkitConf;

inferencer-fluid-cpu/CMakeLists.txt

 FILE(GLOB fluid_cpu_engine_srcs ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp)
 add_library(fluid_cpu_engine ${fluid_cpu_engine_srcs})
 target_include_directories(fluid_cpu_engine PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${PADDLE_INCLUDE_DIR}
         ${CMAKE_BINARY_DIR}/Paddle/fluid_install_dir/)
 add_dependencies(fluid_cpu_engine pdserving extern_paddle configure)
 target_link_libraries(fluid_cpu_engine pdserving paddle_fluid -liomp5 -lmklml_intel -lpthread -lcrypto -lm -lrt -lssl -ldl -lz)

inferencer-fluid-cpu/include/fluid_cpu_engine.h

@@ -21,8 +21,8 @@
 #include <vector>
 #include "configure/include/configure_parser.h"
 #include "configure/inferencer_configure.pb.h"
-#include "framework/infer.h"
 #include "paddle/fluid/inference/paddle_inference_api.h"
+#include "predictor/framework/infer.h"
 
 namespace baidu {
 namespace paddle_serving {

inferencer-fluid-cpu/src/fluid_cpu_engine.cpp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "inferencer-fluid-cpu/include/fluid_cpu_engine.h"
-#include "framework/factory.h"
+#include "predictor/framework/factory.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/CMakeLists.txt

@@ -8,9 +8,6 @@ include(src/CMakeLists.txt)
 
 add_executable(pdcodegen ${pdcodegen_srcs})
 target_link_libraries(pdcodegen protobuf ${PROTOBUF_PROTOC_LIBRARY})
-target_include_directories(pdcodegen PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/
-        ${CMAKE_CURRENT_BINARY_DIR}/)
 
 add_library(pdserving ${pdserving_srcs})
 set_source_files_properties(
@@ -19,12 +16,6 @@ set_source_files_properties(
         COMPILE_FLAGS  "-Wno-strict-aliasing -Wno-unused-variable -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor")
 add_dependencies(pdserving protobuf boost brpc leveldb pdcodegen configure)
 
-target_include_directories(pdserving PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/
-        ${CMAKE_CURRENT_BINARY_DIR}/
-        ${CMAKE_CURRENT_BINARY_DIR}/../configure
-        ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        )
 target_link_libraries(pdserving
         brpc protobuf boost leveldb configure -lpthread -lcrypto -lm -lrt -lssl -ldl -lz)
 

predictor/common/constant.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/constant.h"
+#include "predictor/common/constant.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/common/constant.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #pragma once
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/common/inner_common.h

@@ -42,6 +42,6 @@
 #include "configure/include/configure_parser.h"
 #include "configure/server_configure.pb.h"
 
-#include "common/constant.h"
-#include "common/types.h"
-#include "common/utils.h"
+#include "predictor/common/constant.h"
+#include "predictor/common/types.h"
+#include "predictor/common/utils.h"

predictor/common/macros.h

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #pragma once
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/common/utils.h

@@ -14,8 +14,8 @@
 
 #pragma once
 #include <string>
-#include "common/inner_common.h"
-#include "common/macros.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/common/macros.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/bsf-inl-tensor.h

@@ -19,9 +19,9 @@
 #include <algorithm>
 #include <deque>
 #include <vector>
-#include "common/inner_common.h"
-#include "framework/infer_data.h"
-#include "framework/memory.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/infer_data.h"
+#include "predictor/framework/memory.h"
 
 #include <boost/function.hpp>
 

predictor/framework/bsf-inl.h

@@ -18,7 +18,7 @@
 #include <sys/syscall.h>
 #include <boost/bind.hpp>
 
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace im {
 namespace bsf {

predictor/framework/bsf.h

@@ -19,7 +19,7 @@
 #include <deque>
 #include <vector>
 #include "butil/atomicops.h"
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 #include "boost/function.hpp"
 

predictor/framework/channel.h

@@ -15,7 +15,7 @@
 #pragma once
 #include <string>
 #include <utility>
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/dag.cpp

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "framework/dag.h"
+#include "predictor/framework/dag.h"
 #include <string>
 #include <vector>
-#include "common/inner_common.h"
-#include "framework/predictor_metric.h"  // PredictorMetric
-#include "op/op.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/predictor_metric.h"  // PredictorMetric
+#include "predictor/op/op.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/dag.h

@@ -15,7 +15,7 @@
 #pragma once
 #include <string>
 #include <vector>
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/dag_view.cpp

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "framework/dag_view.h"
+#include "predictor/framework/dag_view.h"
 #include <brpc/traceprintf.h>  // TRACEPRINTF
 #include <string>
-#include "common/inner_common.h"
-#include "framework/op_repository.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/op_repository.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/dag_view.h

@@ -15,10 +15,10 @@
 #pragma once
 #include <string>
 #include <vector>
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/dag.h"
-#include "op/op.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/dag.h"
+#include "predictor/op/op.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/factory.h

@@ -16,8 +16,8 @@
 #include <map>
 #include <string>
 #include <utility>
-#include "common/inner_common.h"
 #include "glog/raw_logging.h"
+#include "predictor/common/inner_common.h"
 namespace baidu {
 namespace paddle_serving {
 namespace predictor {

predictor/framework/infer.h

@@ -18,10 +18,10 @@
 #include <unistd.h>
 #include <string>
 #include <vector>
-#include "common/inner_common.h"
-#include "framework/bsf.h"
-#include "framework/factory.h"
-#include "framework/infer_data.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/bsf.h"
+#include "predictor/framework/factory.h"
+#include "predictor/framework/infer_data.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/infer_data.h

@@ -15,7 +15,7 @@
 #pragma once
 #include <string>
 #include <vector>
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/manager.h

@@ -15,10 +15,10 @@
 #pragma once
 #include <string>
 #include <utility>
-#include "common/constant.h"
-#include "common/inner_common.h"
-#include "framework/service.h"
-#include "framework/workflow.h"
+#include "predictor/common/constant.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/service.h"
+#include "predictor/framework/workflow.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/memory.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "framework/memory.h"
-#include "common/inner_common.h"
+#include "predictor/framework/memory.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/memory.h

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "common/inner_common.h"
-#include "mempool/mempool.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/mempool/mempool.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/merger.h

@@ -15,7 +15,7 @@
 #pragma once
 #include <map>
 #include <string>
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/op_repository.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "framework/op_repository.h"
+#include "predictor/framework/op_repository.h"
 #include <string>
-#include "op/op.h"
+#include "predictor/op/op.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/op_repository.h

@@ -14,7 +14,7 @@
 
 #pragma once
 #include <string>
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/resource.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "framework/resource.h"
+#include "predictor/framework/resource.h"
 #include <string>
-#include "common/inner_common.h"
-#include "framework/infer.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/infer.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/resource.h

@@ -14,8 +14,8 @@
 
 #pragma once
 #include <string>
-#include "common/inner_common.h"
-#include "framework/memory.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/memory.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/server.cpp

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "framework/server.h"
+#include "predictor/framework/server.h"
 #include <brpc/policy/nova_pbrpc_protocol.h>     // NovaServiceAdaptor
 #include <brpc/policy/nshead_mcpack_protocol.h>  // NsheadMcpackAdaptor
 #include <brpc/policy/public_pbrpc_protocol.h>   // PublicPbrpcServiceAdaptor
 #include <string>
 #include <utility>
-#include "common/inner_common.h"
-#include "framework/manager.h"
-#include "framework/resource.h"
-#include "framework/service_manager.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/manager.h"
+#include "predictor/framework/resource.h"
+#include "predictor/framework/service_manager.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/server.h

@@ -14,7 +14,7 @@
 
 #pragma once
 #include <string>
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/service.cpp

@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "framework/service.h"
+#include "predictor/framework/service.h"
 #include <butil/time.h>  // butil::Timer
 #include <list>
 #include <string>
 #include <vector>
-#include "common/constant.h"
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/dag_view.h"
-#include "framework/manager.h"
-#include "framework/predictor_metric.h"  // PredictorMetric
-#include "framework/resource.h"
-#include "framework/server.h"
+#include "predictor/common/constant.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/dag_view.h"
+#include "predictor/framework/manager.h"
+#include "predictor/framework/predictor_metric.h"  // PredictorMetric
+#include "predictor/framework/resource.h"
+#include "predictor/framework/server.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/service.h

@@ -16,9 +16,9 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include "common/inner_common.h"
-#include "framework/merger.h"
-#include "framework/workflow.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/merger.h"
+#include "predictor/framework/workflow.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/service_manager.h

@@ -15,7 +15,7 @@
 #pragma once
 #include <string>
 #include <utility>
-#include "common/inner_common.h"
+#include "predictor/common/inner_common.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/workflow.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "framework/workflow.h"
+#include "predictor/framework/workflow.h"
 #include <string>
-#include "common/inner_common.h"
-#include "framework/predictor_metric.h"  // PredictorMetric
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/predictor_metric.h"  // PredictorMetric
 
 namespace baidu {
 namespace paddle_serving {

predictor/framework/workflow.h

@@ -14,9 +14,9 @@
 
 #pragma once
 #include <string>
-#include "common/inner_common.h"
-#include "framework/dag.h"
-#include "framework/dag_view.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/dag.h"
+#include "predictor/framework/dag_view.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/mempool/mempool.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "mempool/mempool.h"
+#include "predictor/mempool/mempool.h"
 
 namespace im {
 

predictor/op/op.cpp

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "op/op.h"
+#include "predictor/op/op.h"
 #include <butil/time.h>  // butil::Timer
 #include <string>
-#include "common/constant.h"
-#include "common/utils.h"
-#include "framework/channel.h"
-#include "framework/dag.h"
+#include "predictor/common/constant.h"
+#include "predictor/common/utils.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/dag.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/op/op.h

@@ -15,10 +15,10 @@
 #pragma once
 #include <bvar/bvar.h>  // bvar::LatencyRecorder
 #include <string>
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/op_repository.h"
-#include "framework/predictor_metric.h"  // PredictorMetric
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/framework/predictor_metric.h"  // PredictorMetric
 
 namespace baidu {
 namespace paddle_serving {

predictor/plugin/substitute.cc

@@ -45,10 +45,9 @@
 // Author: kenton@google.com (Kenton Varda)
 
 // #include <google/protobuf/stubs/strutil.h>
-#include "plugin/strutil.h"
-
-#include "plugin/stl_util-inl.h"
-#include "plugin/substitute.h"
+#include "predictor/plugin/substitute.h"
+#include "predictor/plugin/stl_util-inl.h"
+#include "predictor/plugin/strutil.h"
 
 namespace google {
 namespace protobuf {

predictor/plugin/substitute.h

@@ -49,7 +49,7 @@
 #include <string>
 // hmmm...
 // #include <google/protobuf/stubs/strutil.h>
-#include "plugin/strutil.h"
+#include "predictor/plugin/strutil.h"
 
 #pragma once
 namespace google {

predictor/src/pdcodegen.cpp

@@ -20,9 +20,9 @@
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 #include "google/protobuf/io/zero_copy_stream.h"
-#include "plugin/strutil.h"
-#include "plugin/substitute.h"
 #include "predictor/pds_option.pb.h"
+#include "predictor/plugin/strutil.h"
+#include "predictor/plugin/substitute.h"
 using std::string;
 using google::protobuf::Descriptor;
 using google::protobuf::FileDescriptor;
@@ -110,16 +110,16 @@ class PdsCodeGenerator : public CodeGenerator {
             context->OpenForInsert(header, "includes"));
         google::protobuf::io::Printer printer(output.get(), '$');
         if (generate_impl) {
-          printer.Print("#include \"common/inner_common.h\"\n");
-          printer.Print("#include \"framework/service.h\"\n");
-          printer.Print("#include \"framework/manager.h\"\n");
-          printer.Print("#include \"framework/service_manager.h\"\n");
+          printer.Print("#include \"predictor/common/inner_common.h\"\n");
+          printer.Print("#include \"predictor/framework/service.h\"\n");
+          printer.Print("#include \"predictor/framework/manager.h\"\n");
+          printer.Print("#include \"predictor/framework/service_manager.h\"\n");
         }
         if (generate_stub) {
           printer.Print("#include <brpc/parallel_channel.h>\n");
-          printer.Print("#include \"factory.h\"\n");
-          printer.Print("#include \"stub.h\"\n");
-          printer.Print("#include \"stub_impl.h\"\n");
+          printer.Print("#include \"sdk-cpp/include/factory.h\"\n");
+          printer.Print("#include \"sdk-cpp/include/stub.h\"\n");
+          printer.Print("#include \"sdk-cpp/include/stub_impl.h\"\n");
         }
         include_inserted = true;
       }

predictor/src/pdserving.cpp

@@ -20,13 +20,13 @@
 #include <fstream>
 #include <iostream>
 #include "butil/logging.h"
-#include "common/constant.h"
-#include "common/inner_common.h"
-#include "framework/manager.h"
-#include "framework/resource.h"
-#include "framework/server.h"
-#include "framework/service.h"
-#include "framework/workflow.h"
+#include "predictor/common/constant.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/manager.h"
+#include "predictor/framework/resource.h"
+#include "predictor/framework/server.h"
+#include "predictor/framework/service.h"
+#include "predictor/framework/workflow.h"
 
 using baidu::paddle_serving::predictor::ServerManager;
 using baidu::paddle_serving::predictor::WorkflowManager;

sdk-cpp/CMakeLists.txt

@@ -2,62 +2,26 @@ include(src/CMakeLists.txt)
 include(proto/CMakeLists.txt)
 add_library(sdk-cpp ${sdk_cpp_srcs})
 add_dependencies(sdk-cpp pdcodegen configure)
-target_include_directories(sdk-cpp PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMKAE_CURRENT_BINARY_DIR}/
-        ${CMAKE_CURRENT_BINARY_DIR}/../configure
-        ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        )
 target_link_libraries(sdk-cpp brpc configure protobuf leveldb)
 
 add_executable(ximage ${CMAKE_CURRENT_LIST_DIR}/demo/ximage.cpp)
-target_include_directories(ximage PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../configure
-        ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        )
 target_link_libraries(ximage -Wl,--whole-archive sdk-cpp
                -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl
         -lz)
 
 add_executable(echo ${CMAKE_CURRENT_LIST_DIR}/demo/echo.cpp)
-target_include_directories(echo PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../configure
-        ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        )
 target_link_libraries(echo -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl
         -lz)
 
 add_executable(dense_format ${CMAKE_CURRENT_LIST_DIR}/demo/dense_format.cpp)
-target_include_directories(dense_format PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../configure
-        ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        )
 target_link_libraries(dense_format -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl
         -lz)
 
 add_executable(sparse_format ${CMAKE_CURRENT_LIST_DIR}/demo/sparse_format.cpp)
-target_include_directories(sparse_format PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../configure
-        ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        )
 target_link_libraries(sparse_format -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl
         -lz)
 
 add_executable(int64tensor_format ${CMAKE_CURRENT_LIST_DIR}/demo/int64tensor_format.cpp)
-target_include_directories(int64tensor_format PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../configure
-        ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        )
 target_link_libraries(int64tensor_format -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl
         -lz)
 

serving/CMakeLists.txt

@@ -5,8 +5,7 @@ add_executable(serving ${serving_srcs})
 add_dependencies(serving pdcodegen fluid_cpu_engine pdserving paddle_fluid
         opencv_imgcodecs)
 target_include_directories(serving PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/
-        ${CMAKE_CURRENT_BINARY_DIR}/
+        ${CMAKE_CURRENT_BINARY_DIR}/../predictor
         )
 target_link_libraries(serving opencv_imgcodecs
         ${opencv_depend_libs} -Wl,--whole-archive fluid_cpu_engine

serving/op/classify_op.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "op/classify_op.h"
-#include "framework/infer.h"
-#include "framework/memory.h"
-#include "op/reader_op.h"
+#include "serving/op/classify_op.h"
+#include "predictor/framework/infer.h"
+#include "predictor/framework/memory.h"
+#include "serving/op/reader_op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/common_echo_op.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "op/common_echo_op.h"
+#include "serving/op/common_echo_op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/common_echo_op.h

@@ -15,10 +15,10 @@
 #pragma once
 #include "serving/echo_service.pb.h"
 
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/op_repository.h"
-#include "op/op.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/op/op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/dense_echo_op.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "op/dense_echo_op.h"
+#include "serving/op/dense_echo_op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/dense_echo_op.h

@@ -15,10 +15,10 @@
 #pragma once
 #include "serving/dense_service.pb.h"
 
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/op_repository.h"
-#include "op/op.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/op/op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/int64tensor_echo_op.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "op/int64tensor_echo_op.h"
+#include "serving/op/int64tensor_echo_op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/int64tensor_echo_op.h

@@ -15,10 +15,10 @@
 #pragma once
 #include "serving/int64tensor_service.pb.h"
 
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/op_repository.h"
-#include "op/op.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/op/op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/reader_op.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "op/reader_op.h"
+#include "serving/op/reader_op.h"
 #include <algorithm>
-#include "framework/memory.h"
+#include "predictor/framework/memory.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/reader_op.h

@@ -15,11 +15,11 @@
 #pragma once
 #include <string>
 #include <vector>
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/op_repository.h"
-#include "op/op.h"
 #include "predictor/builtin_format.pb.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/op/op.h"
 #include "serving/image_class.pb.h"
 
 // opencv

serving/op/sparse_echo_op.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "op/sparse_echo_op.h"
+#include "serving/op/sparse_echo_op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/sparse_echo_op.h

@@ -15,10 +15,10 @@
 #pragma once
 #include "serving/sparse_service.pb.h"
 
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/op_repository.h"
-#include "op/op.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/op/op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/write_json_op.cpp

@@ -16,8 +16,8 @@
 #include <string>
 #include "json2pb/pb_to_json.h"
 
-#include "framework/memory.h"
-#include "op/write_json_op.h"
+#include "predictor/framework/memory.h"
+#include "serving/op/write_json_op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/write_json_op.h

@@ -13,10 +13,10 @@
 // limitations under the License.
 
 #pragma once
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/op_repository.h"
-#include "op/op.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/op/op.h"
 #include "serving/image_class.pb.h"
 
 namespace baidu {

serving/op/write_op.cpp

@@ -16,8 +16,8 @@
 #include <string>
 #include "json2pb/pb_to_json.h"
 
-#include "framework/memory.h"
-#include "op/write_op.h"
+#include "predictor/framework/memory.h"
+#include "serving/op/write_op.h"
 
 namespace baidu {
 namespace paddle_serving {

serving/op/write_op.h

@@ -13,11 +13,11 @@
 // limitations under the License.
 
 #pragma once
-#include "common/inner_common.h"
-#include "framework/channel.h"
-#include "framework/op_repository.h"
-#include "op/op.h"
 #include "predictor/builtin_format.pb.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/op/op.h"
 #include "serving/image_class.pb.h"
 
 namespace baidu {