[WIP] fix CMake issues of mkldnn quant demo (#735)

* fix CMake issues of mkldnn quant demo

* remove deleted libs

* update

demo/mkldnn_quant/CMakeLists.txt

@@ -20,16 +20,13 @@ include_directories("${PADDLE_LIB}/third_party/install/protobuf/include")
 include_directories("${PADDLE_LIB}/third_party/install/glog/include")
 include_directories("${PADDLE_LIB}/third_party/install/gflags/include")
 include_directories("${PADDLE_LIB}/third_party/install/xxhash/include")
-include_directories("${PADDLE_LIB}/third_party/install/zlib/include")
-include_directories("${PADDLE_LIB}/third_party/boost")
-include_directories("${PADDLE_LIB}/third_party/eigen3")
-
-link_directories("${PADDLE_LIB}/third_party/install/zlib/lib")
+include_directories("${PADDLE_LIB}/third_party/install/cryptopp/include")
 link_directories("${PADDLE_LIB}/third_party/install/protobuf/lib")
 link_directories("${PADDLE_LIB}/third_party/install/glog/lib")
 link_directories("${PADDLE_LIB}/third_party/install/gflags/lib")
 link_directories("${PADDLE_LIB}/third_party/install/xxhash/lib")
 link_directories("${PADDLE_LIB}/paddle/lib")
+link_directories("${PADDLE_LIB}/third_party/install/cryptopp/lib")
 
 add_executable(${DEMO_NAME} ${DEMO_NAME}.cc)
 
@@ -43,21 +40,22 @@ if(WITH_MKL)
     set(MKLDNN_LIB ${MKLDNN_PATH}/lib/libmkldnn.so.0)
   endif()
 else()
+  include_directories("${PADDLE_LIB}/third_party/install/openblas/include")
   set(MATH_LIB ${PADDLE_LIB}/third_party/install/openblas/lib/libopenblas${CMAKE_STATIC_LIBRARY_SUFFIX})
 endif()
 
 # Note: libpaddle_inference_api.so/a must put before libpaddle_fluid.so/a
 if(WITH_STATIC_LIB)
   set(DEPS
-      ${PADDLE_LIB}/paddle/lib/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
+      ${PADDLE_LIB}/paddle/lib/libpaddle_inference${CMAKE_STATIC_LIBRARY_SUFFIX})
 else()
   set(DEPS
-      ${PADDLE_LIB}/paddle/lib/libpaddle_fluid${CMAKE_SHARED_LIBRARY_SUFFIX})
+      ${PADDLE_LIB}/paddle/lib/libpaddle_inference${CMAKE_SHARED_LIBRARY_SUFFIX})
 endif()
 
 set(EXTERNAL_LIB "-lrt -ldl -lpthread")
 set(DEPS ${DEPS}
-    ${MATH_LIB} ${MKLDNN_LIB} glog gflags xxhash protobuf z 
+    ${MATH_LIB} ${MKLDNN_LIB} glog gflags xxhash protobuf cryptopp
     ${EXTERNAL_LIB})
 
 target_link_libraries(${DEMO_NAME} ${DEPS})

demo/mkldnn_quant/run.sh

@@ -5,6 +5,9 @@ default_num_threads=1
 default_with_accuracy=false
 num_threads=${3:-$default_num_threads}
 with_accuracy_layer=${4:-$default_with_accuracy}
+default_with_analysis=true
+with_analysis=${5:-$default_with_analysis}
+
 ITERATIONS=0
 
 GLOG_logtostderr=1 ./build/sample_tester \
@@ -14,4 +17,4 @@ GLOG_logtostderr=1 ./build/sample_tester \
     --num_threads=${num_threads} \
     --iterations=${ITERATIONS} \
     --with_accuracy_layer=${with_accuracy_layer} \
-    --use_analysis=false
+    --use_analysis=${with_analysis}