Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / mkl-dnn / cmake / OpenMP.cmake

diff --git a/inference-engine/thirdparty/mkl-dnn/cmake/OpenMP.cmake b/inference-engine/thirdparty/mkl-dnn/cmake/OpenMP.cmake
index f9c3620..086c9c2 100644 (file)
--- a/inference-engine/thirdparty/mkl-dnn/cmake/OpenMP.cmake
+++ b/inference-engine/thirdparty/mkl-dnn/cmake/OpenMP.cmake
@@ -21,10 +21,11 @@ if(OpenMP_cmake_included)
     return()
 endif()
 set(OpenMP_cmake_included true)
-
 include("cmake/Threading.cmake")
 include("cmake/MKL.cmake")
 
+set(MKLDNN_USES_INTEL_OPENMP FALSE)
+
 if (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     # OSX Clang doesn't have OpenMP by default.
     # But we still want to build the library.
@@ -33,13 +34,16 @@ else()
     set(_omp_severity "FATAL_ERROR")
 endif()
 
-
 macro(forbid_link_compiler_omp_rt)
     if (NOT WIN32)
-        set_if(OpenMP_C_FOUND CMAKE_C_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS ${OpenMP_C_FLAGS})
-        set_if(OpenMP_CXX_FOUND CMAKE_CXX_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS ${OpenMP_CXX_FLAGS})
+        set_if(OpenMP_C_FOUND
+            CMAKE_C_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS
+            "${OpenMP_C_FLAGS}")
+        set_if(OpenMP_CXX_FOUND
+            CMAKE_CXX_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS
+            "${OpenMP_CXX_FLAGS}")
         if (NOT APPLE)
-            set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
+            append(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
         endif()
     endif()
 endmacro()
@@ -47,30 +51,33 @@ endmacro()
 macro(use_intel_omp_rt)
     # fast return
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        set(MKLDNN_USES_INTEL_OPENMP TRUE)
         return()
     endif()
 
     # Do not link with compiler-native OpenMP library if Intel MKL is present.
     # Rationale: Intel MKL comes with Intel OpenMP library which is compatible
     # with all libraries shipped with compilers that Intel MKL-DNN supports.
-    if(HAVE_MKL)
+    get_filename_component(MKLIOMP5LIB "${MKLIOMP5LIB}" PATH)
+    find_library(IOMP5LIB
+                NAMES "iomp5" "iomp5md" "libiomp5" "libiomp5md"
+                HINTS  ${MKLIOMP5LIB} )
+    if(IOMP5LIB)
         forbid_link_compiler_omp_rt()
-        if (UNIX AND NOT APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-            # For some reasons Clang ignores `-fopenmp=libiomp5` switch and
-            # links against libomp.so anyways.
-            # The workaround is to set the full path to libiomp5.so
-            add_library(libiomp5 SHARED IMPORTED)
-            set_property(TARGET libiomp5 PROPERTY IMPORTED_LOCATION "${MKLIOMP5LIB}")
-            list(APPEND EXTRA_LIBS libiomp5)
-        else()
-            list(APPEND EXTRA_LIBS ${MKLIOMP5LIB})
+        if (WIN32)
+            get_filename_component(MKLIOMP5DLL "${MKLIOMP5DLL}" PATH)
+            find_file(IOMP5DLL
+                NAMES "libiomp5.dll" "libiomp5md.dll"
+                HINTS ${MKLIOMP5DLL})
         endif()
+        list(APPEND EXTRA_SHARED_LIBS ${IOMP5LIB})
     else()
         if (MKLDNN_THREADING STREQUAL "OMP:INTEL")
             message(${_omp_severity} "Intel OpenMP runtime could not be found. "
                 "Please either use OpenMP runtime that comes with the compiler "
                 "(via -DMKLDNN_THREADING={OMP,OMP:COMP}), or "
-                "install Intel MKL / Intel MKL-ML (e.g. scripts/prepare_mkl.sh)")
+                "explicitely provide the path to libiomp with the "
+                "-DCMAKE_LIBRARY_PATH option")
         endif()
     endif()
 endmacro()
@@ -83,7 +90,7 @@ elseif(MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     append(CMAKE_C_FLAGS "-Xclang -fopenmp")
     append(CMAKE_CXX_FLAGS "-Xclang -fopenmp")
     set(OpenMP_CXX_FOUND true)
-    list(APPEND EXTRA_LIBS ${MKLIOMP5LIB})
+    list(APPEND EXTRA_SHARED_LIBS ${IOMP5LIB})
 else()
     find_package(OpenMP)
     #newer version for findOpenMP (>= v. 3.9)
@@ -96,24 +103,29 @@ else()
         set(OpenMP_C_FOUND true)
         set(OpenMP_CXX_FOUND true)
     endif()
-    append_if(OpenMP_C_FOUND CMAKE_C_FLAGS "${OpenMP_C_FLAGS}")
-    append_if(OpenMP_CXX_FOUND CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS}")
+    append_if(OpenMP_C_FOUND CMAKE_SRC_CCXX_FLAGS "${OpenMP_C_FLAGS}")
 endif()
 
 if (MKLDNN_THREADING MATCHES "OMP")
     if (OpenMP_CXX_FOUND)
         set_threading("OMP")
+        append(CMAKE_TEST_CCXX_FLAGS "${OpenMP_CXX_FLAGS}")
+        append(CMAKE_EXAMPLE_CCXX_FLAGS "${OpenMP_CXX_FLAGS}")
     else()
         message(${_omp_severity} "OpenMP library could not be found. "
             "Proceeding might lead to highly sub-optimal performance.")
     endif()
 
     if (MKLDNN_THREADING STREQUAL "OMP:COMP")
-        set(MKLIOMP5LIB "")
-        set(MKLIOMP5DLL "")
+        set(IOMP5LIB "")
+        set(IOMP5DLL "")
     else()
         use_intel_omp_rt()
     endif()
+
+    if(MKLIOMP5LIB)
+        set(MKLDNN_USES_INTEL_OPENMP TRUE)
+    endif()
 else()
     # Compilation happens with OpenMP to enable `#pragma omp simd`
     # but during linkage OpenMP dependency should be avoided
@@ -121,9 +133,9 @@ else()
     return()
 endif()
 
-set_ternary(_omp_lib_msg MKLIOMP5LIB "${MKLIOMP5LIB}" "provided by compiler")
+set_ternary(_omp_lib_msg IOMP5LIB "${IOMP5LIB}" "provided by compiler")
 message(STATUS "OpenMP lib: ${_omp_lib_msg}")
 if(WIN32)
-    set_ternary(_omp_dll_msg MKLIOMP5DLL "${MKLIOMP5LIB}" "provided by compiler")
+    set_ternary(_omp_dll_msg IOMP5DLL "${IOMP5LIB}" "provided by compiler")
     message(STATUS "OpenMP dll: ${_omp_dll_msg}")
 endif()