Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 676f8d3

Browse files
authored
Use pre-built tbb on macos (#2371)
* Use pre-built tbb on macos * Review comments * Only copy lib when changed
1 parent eecf585 commit 676f8d3

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ else()
336336
include(cmake/external_llvm.cmake)
337337
endif()
338338

339-
if (WIN32)
339+
if (WIN32 OR APPLE)
340340
include(cmake/external_tbb_prebuilt.cmake)
341341
else()
342342
include(cmake/external_tbb.cmake)

cmake/external_tbb_prebuilt.cmake

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@
1616

1717
include(ExternalProject)
1818

19+
set(ARCHIVE_FILE_BASE tbb2019_20181203oss)
1920
if (WIN32)
20-
set(ARCHIVE_FILE_BASE tbb2019_20181203oss)
2121
set(TBB_FILE https://github.com/01org/tbb/releases/download/2019_U3/${ARCHIVE_FILE_BASE}_win.zip)
2222
set(TBB_SHA1_HASH 1989458a49e780d76248edac13b963f80c9a460c)
23+
elseif(APPLE)
24+
set(TBB_FILE https://github.com/01org/tbb/releases/download/2019_U3/${ARCHIVE_FILE_BASE}_mac.tgz)
25+
set(TBB_SHA1_HASH 36926fb46add578b88a5c7e19652b94bb612e4be)
2326
endif()
2427

2528
ExternalProject_Add(
@@ -37,11 +40,26 @@ ExternalProject_Add(
3740
ExternalProject_Get_Property(ext_tbb SOURCE_DIR)
3841
set(SOURCE_DIR ${SOURCE_DIR}/${ARCHIVE_FILE_BASE})
3942

40-
set(TBB_LINK_LIBS
41-
${SOURCE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clangTooling${CMAKE_SHARED_LIBRARY_SUFFIX}
42-
${SOURCE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clangTooling${CMAKE_SHARED_LIBRARY_SUFFIX}
43-
${SOURCE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clangTooling${CMAKE_SHARED_LIBRARY_SUFFIX}
44-
)
43+
if (WIN32)
44+
set(TBB_LINK_LIBS
45+
${SOURCE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clangTooling${CMAKE_SHARED_LIBRARY_SUFFIX}
46+
)
47+
elseif(APPLE)
48+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
49+
set(TBB_LIB_NAME tbb_debug)
50+
else()
51+
set(TBB_LIB_NAME tbb)
52+
endif()
53+
set(TBB_LINK_LIBS
54+
${NGRAPH_BUILD_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${TBB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
55+
)
56+
57+
add_custom_command(TARGET ext_tbb POST_BUILD
58+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SOURCE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${TBB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${NGRAPH_BUILD_DIR}
59+
COMMENT "Move tbb libraries to ngraph build directory"
60+
)
61+
endif()
62+
4563

4664
add_library(libtbb INTERFACE)
4765
add_dependencies(libtbb ext_tbb)

src/ngraph/runtime/cpu/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ if (NGRAPH_HALIDE)
133133
)
134134
endif()
135135

136-
if (NGRAPH_TBB_ENABLE AND NOT WIN32)
136+
if (NGRAPH_TBB_ENABLE AND NOT (WIN32 OR APPLE))
137137
include(${TBB_ROOT}/cmake/TBBBuild.cmake)
138138
tbb_build(TBB_ROOT ${TBB_ROOT} MAKE_ARGS tbb_build_dir=${CMAKE_CURRENT_BINARY_DIR}/tbb_build
139139
tbb_build_prefix=tbb CONFIG_DIR TBB_DIR)

0 commit comments

Comments
 (0)