Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: uxlfoundation/oneDNN
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: openvinotoolkit/oneDNN
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: luwei/fix_deconv_depthwise
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
31 contributors
Loading
Showing 307 changed files with 19,215 additions and 3,287 deletions.
7 changes: 5 additions & 2 deletions cmake/TBB.cmake
View file
Original file line number Diff line number Diff line change
@@ -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()

7 changes: 3 additions & 4 deletions cmake/Threading.cmake
View file
Original file line number Diff line number Diff line change
@@ -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)
183 changes: 0 additions & 183 deletions cmake/lnx/TBBConfig.cmake
View file

This file was deleted.

127 changes: 0 additions & 127 deletions cmake/mac/TBBConfig.cmake
View file

This file was deleted.

2 changes: 1 addition & 1 deletion cmake/options.cmake
View file
Original file line number Diff line number Diff line change
@@ -198,7 +198,7 @@ set(DNNL_CPU_RUNTIME "OMP" CACHE STRING
To use Threading Building Blocks (TBB) one should also
set TBBROOT (either environment variable or CMake option) to the library
location.")
if(NOT "${DNNL_CPU_RUNTIME}" MATCHES "^(NONE|OMP|TBB|SEQ|THREADPOOL|DPCPP|SYCL)$")
if(NOT "${DNNL_CPU_RUNTIME}" MATCHES "^(NONE|OMP|TBB|TBB_AUTO|SEQ|THREADPOOL|DPCPP|SYCL)$")
message(FATAL_ERROR "Unsupported CPU runtime: ${DNNL_CPU_RUNTIME}")
endif()

Loading