Fix BCLOUD

BCLOUD

@@ -8,6 +8,14 @@ COMPILER('gcc482')
 
 CONFIGS('third-64/protobuf@protobuf_3-2-0-6274_PD_BL')
 CONFIGS('baidu/third-party/mklml@v20180406@git_branch')
+CONFIGS('baidu/base/baidu-rpc@ci-base')
+CONFIGS('baidu/third-party/gflags@v2.0.0@git_branch')
+CONFIGS('baidu/third-party/glog@v0.3.x@git_branch')
+CONFIGS('baidu/third-party/opencv@master@git_branch')
+
+PROTOC('third-64/protobuf/output/bin/protoc')
+CONFIGS('baidu/paddlepaddle/paddle@v1.3.0_pb32@git_branch')
+
 NEED_OUTPUT('baidu/third-party/mklml')
 
 #sub directory

inferencer-fluid-cpu/BCLOUD

@@ -17,9 +17,6 @@ INCPATHS('$INC')
 INCPATHS('../')
 INCPATHS('$OUT_ROOT/third-64/protobuf/output/include')
 
-PROTOC('third-64/protobuf/output/bin/protoc')
-CONFIGS('baidu/paddlepaddle/paddle@v1.3.0_pb32@git_branch')
-
 HEADERS('include/fluid_cpu_engine.h', '$INC/inferencer-fluid-cpu/include')
 
 inferencer_fluid_cpu_sources = 'src/fluid_cpu_engine.cpp'

predictor/BCLOUD

@@ -16,8 +16,6 @@ INCPATHS('$INC')
 INCPATHS('../')
 INCPATHS('$OUT_ROOT/third-64/protobuf/output/include')
 
-CONFIGS('baidu/base/baidu-rpc@ci-base')
-
 cpp_source_dirs = []
 cpp_source_dirs.append('common/*.cpp')
 cpp_source_dirs.append('op/*.cpp')
@@ -29,6 +27,7 @@ HEADERS(GLOB_GEN_SRCS('proto/*.pb.h'), '$INC/predictor/')
 HEADERS('common/*.h', '$INC/predictor/common')
 HEADERS('framework/*.h', '$INC/predictor/framework')
 HEADERS('mempool/*.h', '$INC/predictor/mempool')
+HEADERS('op/*.h', '$INC/predictor/op')
 
 #.a
 StaticLibrary('pdserving', Sources(GLOB(' '.join(cpp_source_dirs)), 'src/pdserving.cpp'))

predictor/CMakeLists.txt

@@ -33,3 +33,6 @@ install(FILES ${inc_framework}
 
 install(FILES ${CMAKE_CURRENT_LIST_DIR}/mempool/mempool.h
         DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/predictor/mempool)
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/op/op.h
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/predictor/op)
+

serving/BCLOUD

@@ -30,11 +30,6 @@ LIBS('$OUT_ROOT/baidu/third-party/mklml/output/so/libmklml_intel.so')
 LIBS('$OUT_ROOT/baidu/third-party/mklml/output/so/libmklml_gnu.so')
 LIBS('$OUT_ROOT/baidu/third-party/mklml/output/so/libiomp5.so')
 
-CONFIGS('baidu/base/baidu-rpc@ci-base')
-CONFIGS('baidu/third-party/gflags@v2.0.0@git_branch')
-CONFIGS('baidu/third-party/glog@v0.3.x@git_branch')
-CONFIGS('baidu/third-party/opencv@master@git_branch')
-
 cpp_source_dirs = []
 cpp_source_dirs.append('op/*.cpp')
 cpp_source_dirs.append('proto/*.proto')