Fix README

Change-Id: I44e4566f435b3868ffcefc1dca8d29676b63460b

CMakeLists.txt

@@ -86,7 +86,6 @@ set(EXTERNAL_LIBS
     brpc
 )
 
-
 if(WITH_MKLML)
     list(APPEND EXTERNAL_LIBS ${MKLML_IOMP_LIB})
 endif()
@@ -104,9 +103,10 @@ endif()
 add_subdirectory(configure)
 add_subdirectory(pdcodegen)
 add_subdirectory(sdk-cpp)
+add_subdirectory(demo-client)
 
 if (NOT CLIENT_ONLY)
 add_subdirectory(predictor)
 add_subdirectory(inferencer-fluid-cpu)
-add_subdirectory(serving)
+add_subdirectory(demo-serving)
 endif()

README.md

@@ -41,6 +41,22 @@ Paddle serving框架为策略工程师提供以下三层面的功能性扩展：
 |   |-- proto
 |   |-- src
 |   `-- tests
+|-- demo-client                         # Client端示例；包括如文本分类、图像分类等任务的例子
+|   |-- conf                            # conf目录
+|   |-- data                            # data目录
+|   |   \-- images
+|   `-- src                             # src目录
+|-- demo-serving                        # Serving示例。该目录下代码与libpdserving.a联编，产出一个可执行的serving二进制
+|   |-- conf                            # Serving示例的Conf目录
+|   |-- data                            # Serving示例的data目录
+|   |   `-- model
+|   |       `-- paddle
+|   |           `-- fluid
+|   |               |-- SE_ResNeXt50_32x4d
+|   |               `-- text_classification_lstm
+|   |-- op                              # Serving示例OP
+|   |-- proto                           # Serving示例的proto文件
+|   `-- scripts
 |-- doc                                 # 文档
 |-- inferencer-fluid-cpu                # 与PaddlePaddle CPU预测库的接口代码
 |   |-- include
@@ -51,6 +67,8 @@ Paddle serving框架为策略工程师提供以下三层面的功能性扩展：
 |-- predictor                           # Serving端库: libpdserving.a
 |   |-- common
 |   |-- conf
+|   |-- cts
+|   |   `-- lib
 |   |-- framework
 |   |-- mempool
 |   |-- op
@@ -60,23 +78,10 @@ Paddle serving框架为策略工程师提供以下三层面的功能性扩展：
 |   |-- src
 |   `-- unittest
 |-- sdk-cpp                             # Client端库: libpdsdk-cpp.a
-|   |-- conf                            # Client端示例的conf目录
-|   |-- data                            # Client端示例的data目录
-|   |   `-- images
-|   |-- demo                            # Client端示例代码；包括如文本分类、图像分类等任务的例子
-|   |-- include                         # Client端库的头文件
-|   |-- proto                           # Client端示例的proto文件
-|   `-- src                             # Client端库的源代码文件
-|-- serving                             # Serving示例。该目录下代码与libpdserving.a联编，产出一个可执行的serving二进制
-|   |-- conf                            # Serving示例的Conf目录
-|   |-- data                            # Serving示例的data目录
-|   |   `-- model
-|   |       `-- paddle
-|   |           `-- fluid
-|   |               `-- SE_ResNeXt50_32x4d
-|   |-- op                              # Serving示例OP
-|   |-- proto                           # Serving示例的proto文件
-|   `-- scripts
+|   |-- include
+|   |-- plugin
+|   |-- proto
+|   `-- src
 `-- tools                               # CI工具
     `-- codestyle
 ```

cmake/generic.cmake

@@ -832,7 +832,6 @@ function(PROTOBUF_GENERATE_SERVING_CPP FOR_SERVING_SIDE SRCS HDRS )
     list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
     list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
 
-    message("For serving side " ${FOR_SERVING_SIDE})
     if (${FOR_SERVING_SIDE})
         add_custom_command(
             OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"

demo-client/CMakeLists.txt

+if (NOT EXISTS
+                ${CMAKE_CURRENT_LIST_DIR}/data/text_classification/test_set.txt)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
+                ${CMAKE_CURRENT_LIST_DIR}/data/text_classification)
+        execute_process(COMMAND wget
+                --no-check-certificate
+                https://paddle-serving.bj.bcebos.com/data/text_classification/test_set.tar.gz
+                --output-document
+                ${CMAKE_CURRENT_LIST_DIR}/data/text_classification/test_set.tar.gz)
+
+            execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf
+                "${CMAKE_CURRENT_LIST_DIR}/data/text_classification/test_set.tar.gz"
+                WORKING_DIRECTORY
+                ${CMAKE_CURRENT_LIST_DIR}/data/text_classification
+                )
+endif()
+
+add_executable(ximage ${CMAKE_CURRENT_LIST_DIR}/src/ximage.cpp)
+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}/src/echo.cpp)
+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}/src/dense_format.cpp)
+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}/src/sparse_format.cpp)
+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}/src/int64tensor_format.cpp)
+target_link_libraries(int64tensor_format -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl
+        -lz)
+
+add_executable(text_classification
+        ${CMAKE_CURRENT_LIST_DIR}/src/text_classification.cpp)
+target_link_libraries(text_classification -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl
+        -lz)
+
+add_executable(text_classification_press
+        ${CMAKE_CURRENT_LIST_DIR}/src/text_classification_press.cpp)
+target_link_libraries(text_classification_press -Wl,--whole-archive sdk-cpp -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl
+        -lz)
+
+# install
+install(TARGETS ximage
+        RUNTIME DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/image_classification/bin)
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/image_classification/)
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/data/images DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/image_classification/data)
+
+install(TARGETS echo
+        RUNTIME DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/demo/client/echo/bin)
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/echo/)
+
+install(TARGETS dense_format
+        RUNTIME DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/dense_format/bin)
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/dense_format/)
+
+install(TARGETS sparse_format
+        RUNTIME DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/sparse_format/bin)
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/sparse_format/)
+
+install(TARGETS int64tensor_format
+        RUNTIME DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/int64tensor_format/bin)
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/int64tensor_format/)
+
+install(TARGETS text_classification text_classification_press
+        RUNTIME DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/text_classification/bin)
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/text_classification/)
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/data/text_classification DESTINATION
+        ${PADDLE_SERVING_INSTALL_DIR}/demo/client/text_classification/data)

sdk-cpp/demo/dense_format.cpp → demo-client/src/dense_format.cpp

@@ -62,7 +62,7 @@ void print_res(const Request& req,
 int main(int argc, char** argv) {
   PredictorApi api;
 
-  // initialize logger instance
+// initialize logger instance
 #ifdef BCLOUD
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_FILE;

sdk-cpp/demo/echo.cpp → demo-client/src/echo.cpp

@@ -45,7 +45,7 @@ void print_res(const RequestAndResponse& req,
 int main(int argc, char** argv) {
   PredictorApi api;
 
-  // initialize logger instance
+// initialize logger instance
 #ifdef BCLOUD
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_FILE;

sdk-cpp/demo/int64tensor_format.cpp → demo-client/src/int64tensor_format.cpp

@@ -74,7 +74,7 @@ void print_res(const Request& req,
 int main(int argc, char** argv) {
   PredictorApi api;
 
-  // initialize logger instance
+// initialize logger instance
 #ifdef BCLOUD
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_FILE;

sdk-cpp/demo/sparse_format.cpp → demo-client/src/sparse_format.cpp

@@ -72,7 +72,7 @@ void print_res(const Request& req,
 int main(int argc, char** argv) {
   PredictorApi api;
 
-  // initialize logger instance
+// initialize logger instance
 #ifdef BCLOUD
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_FILE;

sdk-cpp/demo/text_classification.cpp → demo-client/src/text_classification.cpp

@@ -170,7 +170,7 @@ void extract_res(const Request &req, const Response &res) {
 int main(int argc, char **argv) {
   PredictorApi api;
 
-  // initialize logger instance
+// initialize logger instance
 #ifdef BCLOUD
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_FILE;

sdk-cpp/demo/ximage.cpp → demo-client/src/ximage.cpp

@@ -122,7 +122,7 @@ void print_res(const Request& req,
 int main(int argc, char** argv) {
   PredictorApi api;
 
-  // initialize logger instance
+// initialize logger instance
 #ifdef BCLOUD
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_FILE;