oneDNN 2.5 migration

CMakeLists.txt

@@ -110,6 +110,7 @@ set(CMAKE_TEST_CCXX_FLAGS)      # TESTS specifics
 string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPERCASE_CMAKE_BUILD_TYPE)
 
 include("cmake/dnnl_compat.cmake")
+include("cmake/mkldnn_compat.cmake")
 
 include("cmake/utils.cmake")
 include("cmake/options.cmake")

cmake/TBB.cmake

@@ -26,7 +26,10 @@ include("cmake/Threading.cmake")
 macro(handle_tbb_target)
     if(TBB_FOUND)
         set_property(TARGET TBB::tbb PROPERTY "MAP_IMPORTED_CONFIG_RELWITHMDD" "DEBUG")
-        include_directories_with_host_compiler(${_tbb_include_dirs})
+        foreach(inc_dir ${_tbb_include_dirs})
+            include_directories(BEFORE SYSTEM ${inc_dir})
+            append_host_compiler_options(CMAKE_CXX_FLAGS "-I${inc_dir}")
+        endforeach()
         list(APPEND EXTRA_SHARED_LIBS ${TBB_IMPORTED_TARGETS})
 
         # Print TBB location
@@ -56,7 +59,7 @@ macro(handle_tbb_target)
     append_to_windows_path_list(CTESTCONFIG_PATH "${_tbb_redist_dir}")
 endmacro()
 
-if(NOT DNNL_CPU_THREADING_RUNTIME STREQUAL "TBB")
+if(NOT "${DNNL_CPU_THREADING_RUNTIME}" MATCHES "^(TBB|TBB_AUTO)$")
     return()
 endif()
 

cmake/Threading.cmake

@@ -39,13 +39,12 @@ list(APPEND EXTRA_SHARED_LIBS "${CMAKE_THREAD_LIBS_INIT}")
 
 # A macro to avoid code duplication
 macro(find_package_tbb)
-    set(_cmake_proj_dir "${PROJECT_SOURCE_DIR}/cmake")
     if(WIN32)
-        find_package(TBB ${ARGN} COMPONENTS tbb HINTS ${_cmake_proj_dir}/win)
+        find_package(TBB ${ARGN} COMPONENTS tbb)
     elseif(APPLE)
-        find_package(TBB ${ARGN} COMPONENTS tbb HINTS ${_cmake_proj_dir}/mac)
+        find_package(TBB ${ARGN} COMPONENTS tbb)
     elseif(UNIX)
-        find_package(TBB ${ARGN} COMPONENTS tbb HINTS ${_cmake_proj_dir}/lnx)
+        find_package(TBB ${ARGN} COMPONENTS tbb)
     endif()
 
     if(TBB_FOUND)

cmake/gen_mkldnn_compat_cmakes.cmake

@@ -0,0 +1,46 @@
+#===============================================================================
+# Copyright 2019-2020 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#===============================================================================
+
+# Creates cmake config for MKLDNN based on oneDNN one
+# (by replacing DNNL with MKLDNN)
+# Parameters:
+#   DIR -- path to cmake install dir
+
+set(DNNL_DIR ${DIR}/dnnl)
+set(MKLDNN_DIR ${DIR}/mkldnn)
+
+file(MAKE_DIRECTORY ${MKLDNN_DIR})
+
+file(GLOB_RECURSE fs "${DNNL_DIR}/*")
+foreach(f ${fs})
+    # set the destination
+    file(RELATIVE_PATH frel ${DNNL_DIR} ${f})
+    string(REGEX REPLACE "dnnl" "mkldnn" dest_rel "${frel}")
+    set(dest "${MKLDNN_DIR}/${dest_rel}")
+    # message(STATUS "file: ${f} --> ${frel} --> ${dest_rel} --> ${dest}")
+
+    # read and change the content of the file
+    file(STRINGS ${f} contents NEWLINE_CONSUME)
+    string(REGEX REPLACE "DNNL" "MKLDNN" contents "${contents}")
+    string(REGEX REPLACE "dnnl" "mkldnn" contents "${contents}")
+    foreach (ext "a" "so" "dylib" "dll" "lib")
+        string(REGEX REPLACE "mkldnn[.]${ext}" "dnnl.${ext}" contents "${contents}")
+    endforeach()
+    string(REGEX REPLACE "lmkldnn" "ldnnl" contents "${contents}")
+
+    # store the result
+    file(WRITE ${dest} ${contents})
+endforeach()