From bfed1819a71c1d6b4b2d87b709bcd797c111534b Mon Sep 17 00:00:00 2001
From: lidanqing-intel <danqing.li@intel.com>
Date: Sun, 27 Sep 2020 08:32:10 +0200
Subject: [PATCH] add /openmp for windows flag

---
 deploy/cpp_infer/CMakeLists.txt | 22 ++++++++++++++--------
 deploy/cpp_infer/src/main.cpp   | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/deploy/cpp_infer/CMakeLists.txt b/deploy/cpp_infer/CMakeLists.txt
index 466c2be8..4ddb92ee 100644
--- a/deploy/cpp_infer/CMakeLists.txt
+++ b/deploy/cpp_infer/CMakeLists.txt
@@ -42,7 +42,6 @@ if (WIN32)
   include_directories("${PADDLE_LIB}/paddle/include")
   link_directories("${PADDLE_LIB}/paddle/fluid/inference")
   find_package(OpenCV REQUIRED PATHS ${OPENCV_DIR}/build/ NO_DEFAULT_PATH)
-
 else ()
   find_package(OpenCV REQUIRED PATHS ${OPENCV_DIR}/share/OpenCV NO_DEFAULT_PATH)
   include_directories("${PADDLE_LIB}/paddle/include")
@@ -52,20 +51,26 @@ include_directories(${OpenCV_INCLUDE_DIRS})
 
 if (WIN32)
     add_definitions("/DGOOGLE_GLOG_DLL_DECL=")
-    set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG} /bigobj /MTd")
-    set(CMAKE_C_FLAGS_RELEASE  "${CMAKE_C_FLAGS_RELEASE} /bigobj /MT")
-    set(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} /bigobj /MTd")
-    set(CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} /bigobj /MT")
+	if(WITH_MKL)
+		set(FLAG_OPENMP "/openmp")
+	endif()
+    set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG} /bigobj /MTd ${FLAG_OPENMP}")
+    set(CMAKE_C_FLAGS_RELEASE  "${CMAKE_C_FLAGS_RELEASE} /bigobj /MT ${FLAG_OPENMP}")
+    set(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} /bigobj /MTd ${FLAG_OPENMP}")
+    set(CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} /bigobj /MT ${FLAG_OPENMP}")
     if (WITH_STATIC_LIB)
         safe_set_static_flag()
         add_definitions(-DSTATIC_LIB)
     endif()
+	message("cmake c debug flags " ${CMAKE_C_FLAGS_DEBUG})
+	message("cmake c release flags " ${CMAKE_C_FLAGS_RELEASE})
+	message("cmake cxx debug flags " ${CMAKE_CXX_FLAGS_DEBUG})
+	message("cmake cxx release flags " ${CMAKE_CXX_FLAGS_RELEASE})
 else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -o3 -std=c++11")
     set(CMAKE_STATIC_LIBRARY_PREFIX "")
+	message("flags" ${CMAKE_CXX_FLAGS})
 endif()
-message("flags" ${CMAKE_CXX_FLAGS})
-
 
 if (WITH_GPU)
     if (NOT DEFINED CUDA_LIB OR ${CUDA_LIB} STREQUAL "")
@@ -198,4 +203,5 @@ if (WIN32 AND WITH_MKL)
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PADDLE_LIB}/third_party/install/mklml/lib/libiomp5md.dll ./release/libiomp5md.dll
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PADDLE_LIB}/third_party/install/mkldnn/lib/mkldnn.dll ./release/mkldnn.dll
     )
-endif()
\ No newline at end of file
+endif()
+
diff --git a/deploy/cpp_infer/src/main.cpp b/deploy/cpp_infer/src/main.cpp
index e708a6e3..eaec2cb9 100644
--- a/deploy/cpp_infer/src/main.cpp
+++ b/deploy/cpp_infer/src/main.cpp
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "omp.h"
 #include "opencv2/core.hpp"
 #include "opencv2/imgcodecs.hpp"
 #include "opencv2/imgproc.hpp"
@@ -67,6 +68,21 @@ int main(int argc, char **argv) {
                      config.use_mkldnn, config.use_zero_copy_run,
                      config.char_list_file);
 
+#ifdef USE_MKL
+  // test omp parallel
+  int i;
+  std::cout << "...........Testing MKL......... " << omp_get_num_threads()
+            << std::endl;
+#pragma omp parallel for private(i)
+  for (i = 0; i < 50; i++) {
+    std::cout << "omp_get_num_threads(): " << omp_get_num_threads()
+              << std::endl;
+    int tid = omp_get_thread_num();
+    std::cout << "Log from omp thread " << tid << std::endl;
+  }
+
+#endif
+
   auto start = std::chrono::system_clock::now();
   std::vector<std::vector<std::vector<int>>> boxes;
   det.Run(srcimg, boxes);
-- 
GitLab