From 857b17b8991bca3333c67fdf363d5f3c24baf88f Mon Sep 17 00:00:00 2001
From: cnn <liuhui29@baidu.com>
Date: Sun, 6 Dec 2020 19:03:53 +0800
Subject: [PATCH] set batch_size=1 when eval, and fix bug of cpp build on
 winodows (#1822)

---
 configs/yolov3_mobilenet_v1_roadsign.yml |  2 +-
 deploy/cpp/CMakeLists.txt                | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/configs/yolov3_mobilenet_v1_roadsign.yml b/configs/yolov3_mobilenet_v1_roadsign.yml
index 294542f0f..89fd3e7cb 100644
--- a/configs/yolov3_mobilenet_v1_roadsign.yml
+++ b/configs/yolov3_mobilenet_v1_roadsign.yml
@@ -144,7 +144,7 @@ EvalReader:
     - !Permute
       to_bgr: false
       channel_first: True
-  batch_size: 8
+  batch_size: 1
   drop_empty: false
   worker_num: 4
   bufsize: 2
diff --git a/deploy/cpp/CMakeLists.txt b/deploy/cpp/CMakeLists.txt
index de2f9fe66..051782579 100644
--- a/deploy/cpp/CMakeLists.txt
+++ b/deploy/cpp/CMakeLists.txt
@@ -113,9 +113,8 @@ endif()
 
 if (NOT WIN32)
   if (WITH_TENSORRT AND WITH_GPU)
-	  include_directories("${TENSORRT_INC_DIR}/include")
-	  #link_directories("${TENSORRT_LIB_DIR}/lib")
-	  link_directories("${TENSORRT_LIB_DIR}/")
+	  include_directories("${TENSORRT_INC_DIR}")
+	  link_directories("${TENSORRT_LIB_DIR}")
   endif()
 endif(NOT WIN32)
 
@@ -149,7 +148,11 @@ if(WITH_MKL)
     endif ()
   endif()
 else()
-  set(MATH_LIB ${PADDLE_DIR}/third_party/install/openblas/lib/libopenblas${CMAKE_STATIC_LIBRARY_SUFFIX})
+  if (WIN32)
+    set(MATH_LIB ${PADDLE_DIR}/third_party/install/openblas/lib/openblas${CMAKE_STATIC_LIBRARY_SUFFIX})
+  else()
+    set(MATH_LIB ${PADDLE_DIR}/third_party/install/openblas/lib/libopenblas${CMAKE_STATIC_LIBRARY_SUFFIX})
+  endif()
 endif()
 
 if (WIN32)
-- 
GitLab