Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / mkldnn.cmake

diff --git a/inference-engine/thirdparty/mkldnn.cmake b/inference-engine/thirdparty/mkldnn.cmake
index 0cf5045..d90717c 100644 (file)
--- a/inference-engine/thirdparty/mkldnn.cmake
+++ b/inference-engine/thirdparty/mkldnn.cmake
@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright (c) 2016 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,6 +22,34 @@
 set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
+set(version_cmake_included true)
+
+set(TARGET mkldnn)
+set(MKLDNN_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/mkl-dnn)
+
+string(REPLACE "." ";" VERSION_LIST "0.18.0")
+list(GET VERSION_LIST 0 MKLDNN_VERSION_MAJOR)
+list(GET VERSION_LIST 1 MKLDNN_VERSION_MINOR)
+list(GET VERSION_LIST 2 MKLDNN_VERSION_PATCH)
+
+find_package(Git)
+if (GIT_FOUND)
+    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%H
+            WORKING_DIRECTORY ${MKLDNN_ROOT}
+            RESULT_VARIABLE RESULT
+            OUTPUT_VARIABLE MKLDNN_VERSION_HASH
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+
+if(NOT GIT_FOUND OR RESULT)
+    set(MKLDNN_VERSION_HASH "N/A")
+endif()
+
+configure_file(
+    "${MKLDNN_ROOT}/include/mkldnn_version.h.in"
+    "${CMAKE_BINARY_DIR}/include/mkldnn_version.h"
+)
+
 function(detect_mkl LIBNAME)
     message(STATUS "Detecting Intel(R) MKL: trying ${LIBNAME}")
     find_path(MKLINC mkl_cblas.h ${MKL}/include)
@@ -51,9 +79,6 @@ function(detect_mkl LIBNAME)
     endif()
 endfunction()
 
-set(TARGET mkldnn)
-set(MKLDNN_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/mkl-dnn)
-
 if (THREADING STREQUAL "TBB")
     add_definitions(-DMKLDNN_THR=MKLDNN_THR_TBB)
 elseif (THREADING STREQUAL "OMP")
@@ -76,7 +101,9 @@ include_directories(
         ${MKLDNN_ROOT}/include
         ${MKLDNN_ROOT}/src
         ${MKLDNN_ROOT}/src/common
+        ${MKLDNN_ROOT}/src/cpu/
         ${MKLDNN_ROOT}/src/cpu/xbyak
+        ${CMAKE_BINARY_DIR}/include/
 )
 
 if(WIN32)
@@ -88,6 +115,23 @@ if(WIN32)
     endif()
 endif()
 
+# to make build time reasonable, don't use optimizations for s8u8s32 Xbyak
+# kernels
+file(GLOB FILES_WITHNO_OPT
+    ${MKLDNN_ROOT}/src/cpu/gemm/s8x8s32/jit_avx512_core_kernel_b0_gemm_s8u8s32_kern.cpp
+    ${MKLDNN_ROOT}/src/cpu/gemm/s8x8s32/jit_avx512_core_kernel_gemm_s8u8s32_kern.cpp
+    ${MKLDNN_ROOT}/src/cpu/gemm/s8x8s32/jit_avx512_core_u8_copy_an_kern.cpp
+    ${MKLDNN_ROOT}/src/cpu/gemm/s8x8s32/jit_avx512_core_u8_copy_at_kern.cpp
+    ${MKLDNN_ROOT}/src/cpu/gemm/s8x8s32/jit_avx512_core_u8_copy_bn_kern.cpp
+    ${MKLDNN_ROOT}/src/cpu/gemm/s8x8s32/jit_avx512_core_u8_copy_bt_kern.cpp)
+if(WIN32 AND NOT MINGW)
+    set_source_files_properties(${FILES_WITHNO_OPT}
+        PROPERTIES COMPILE_FLAGS "/Od")
+else()
+    set_source_files_properties(${FILES_WITHNO_OPT}
+        PROPERTIES COMPILE_FLAGS "-O0 -U_FORTIFY_SOURCE")
+endif()
+
 add_library(${TARGET} STATIC ${HDR} ${SRC})
 set_ie_threading_interface_for(${TARGET})
 
@@ -98,7 +142,7 @@ if(GEMM STREQUAL "OPENBLAS")
     list(APPEND ${TARGET}_LINKER_LIBS ${BLAS_LIBRARIES})
 elseif (GEMM STREQUAL "MKL")
     ## enable cblas_gemm from mlkml package
-if(WIN32)
+if(WIN32 OR APPLE)
     detect_mkl("mklml")
 else()
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
@@ -113,4 +157,4 @@ endif()
 endif()
 ## enable jit_gemm from mlk-dnn
 
-target_link_libraries(${TARGET} PRIVATE ${${TARGET}_LINKER_LIBS})
\ No newline at end of file
+target_link_libraries(${TARGET} PRIVATE ${${TARGET}_LINKER_LIBS})