diff --git a/2019_U8.tar.gz b/2019_U8.tar.gz deleted file mode 100644 index b798117..0000000 --- a/2019_U8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b1fd8caea14be72ae4175896510bf99c809cd7031306a1917565e6de7382fba -size 2580540 diff --git a/2019_U9.tar.gz b/2019_U9.tar.gz new file mode 100644 index 0000000..54a9801 --- /dev/null +++ b/2019_U9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15652f5328cf00c576f065e5cd3eaf3317422fe82afb67a9bcec0dc065bd2abe +size 2614209 diff --git a/cmake-remove-include-path.patch b/cmake-remove-include-path.patch index cce8cb6..5f03434 100644 --- a/cmake-remove-include-path.patch +++ b/cmake-remove-include-path.patch @@ -1,8 +1,8 @@ -Index: tbb-2019_U8/cmake/templates/TBBConfig.cmake.in +Index: tbb-2019_U9/cmake/templates/TBBConfig.cmake.in =================================================================== ---- tbb-2019_U8.orig/cmake/templates/TBBConfig.cmake.in -+++ tbb-2019_U8/cmake/templates/TBBConfig.cmake.in -@@ -60,8 +60,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO +--- tbb-2019_U9.orig/cmake/templates/TBBConfig.cmake.in ++++ tbb-2019_U9/cmake/templates/TBBConfig.cmake.in +@@ -53,8 +53,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO if (EXISTS "${_tbb_release_lib}" OR EXISTS "${_tbb_debug_lib}") if (NOT TARGET TBB::${_tbb_component}) add_library(TBB::${_tbb_component} SHARED IMPORTED) @@ -11,16 +11,16 @@ Index: tbb-2019_U8/cmake/templates/TBBConfig.cmake.in if (EXISTS "${_tbb_release_lib}") set_target_properties(TBB::${_tbb_component} PROPERTIES -Index: tbb-2019_U8/cmake/templates/TBBConfigInternal.cmake.in +Index: tbb-2019_U9/cmake/templates/TBBConfigInternal.cmake.in =================================================================== ---- tbb-2019_U8.orig/cmake/templates/TBBConfigInternal.cmake.in -+++ tbb-2019_U8/cmake/templates/TBBConfigInternal.cmake.in -@@ -43,8 +43,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO - +--- tbb-2019_U9.orig/cmake/templates/TBBConfigInternal.cmake.in ++++ tbb-2019_U9/cmake/templates/TBBConfigInternal.cmake.in +@@ -54,8 +54,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO if (EXISTS "${_tbb_release_lib}" OR EXISTS "${_tbb_debug_lib}") - add_library(TBB::${_tbb_component} SHARED IMPORTED) -- set_target_properties(TBB::${_tbb_component} PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${_tbb_root}/include"@TBB_COMPILE_DEFINITIONS@) + if (NOT TARGET TBB::${_tbb_component}) + add_library(TBB::${_tbb_component} SHARED IMPORTED) +- set_target_properties(TBB::${_tbb_component} PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${_tbb_root}/include"@TBB_COMPILE_DEFINITIONS@) - if (EXISTS "${_tbb_release_lib}") - set_target_properties(TBB::${_tbb_component} PROPERTIES + if (EXISTS "${_tbb_release_lib}") + set_target_properties(TBB::${_tbb_component} PROPERTIES diff --git a/disable-irml.patch b/disable-irml.patch index da7a5c1..cff8441 100644 --- a/disable-irml.patch +++ b/disable-irml.patch @@ -1,7 +1,7 @@ -Index: tbb-2019_U8/python/setup.py +Index: tbb-2019_U9/python/setup.py =================================================================== ---- tbb-2019_U8.orig/python/setup.py -+++ tbb-2019_U8/python/setup.py +--- tbb-2019_U9.orig/python/setup.py ++++ tbb-2019_U9/python/setup.py @@ -67,7 +67,7 @@ _tbb = Extension("tbb._api", ["tbb/api.i extra_compile_args=compile_flags + tbb_flag, extra_link_args=tbb_flag, @@ -9,5 +9,5 @@ Index: tbb-2019_U8/python/setup.py - (['irml'] if platform.system() == "Linux" else []), # TODO: why do we need this? + (['irml'] if platform.system() == "xLinux" else []), # TODO: why do we need this? library_dirs=[ rundir, # for custom-builds - os.path.join(tbb_root, 'lib', 'intel64', 'gcc4.4'), # for Linux + os.path.join(tbb_root, 'lib', 'intel64', 'gcc4.8'), # for Linux os.path.join(tbb_root, 'lib'), # for MacOS diff --git a/optflags.patch b/optflags.patch index af636dd..1c98f58 100644 --- a/optflags.patch +++ b/optflags.patch @@ -1,13 +1,13 @@ -Index: tbb-2019_U8/build/linux.gcc.inc +Index: tbb-2019_U9/build/linux.gcc.inc =================================================================== ---- tbb-2019_U8.orig/build/linux.gcc.inc -+++ tbb-2019_U8/build/linux.gcc.inc -@@ -65,7 +65,7 @@ ifneq (,$(shell $(CONLY) -dumpfullversio +--- tbb-2019_U9.orig/build/linux.gcc.inc ++++ tbb-2019_U9/build/linux.gcc.inc +@@ -72,7 +72,7 @@ ifeq ($(cfg), debug) + CPLUS_FLAGS = -DTBB_USE_DEBUG -O0 -g endif - ifeq ($(cfg), release) -- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD -+ CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 $(OPTFLAGS) -DUSE_PTHREAD - endif - ifeq ($(cfg), debug) - CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD +-CPLUS_FLAGS += $(ITT_NOTIFY) -DUSE_PTHREAD -pthread ++CPLUS_FLAGS += $(ITT_NOTIFY) $(OPTFLAGS) -DUSE_PTHREAD -pthread + LIB_LINK_FLAGS += -pthread + + TBB_ASM.OBJ= diff --git a/tbb.changes b/tbb.changes index 3bb347e..27de562 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Oct 10 12:45:32 UTC 2019 - Ismail Dönmez + +- Update to version 2019_u9 + * Multiple APIs are deprecated. For details, please see + Deprecated Features appendix in the TBB reference manual. + * Added C++17 deduction guides for flow graph nodes. + + Preview Features + * Added isolated_task_group class that allows multiple threads to add + and execute tasks sharing the same isolation. + * Extended the flow graph API to simplify connecting nodes. + * Added erase() by heterogeneous keys for concurrent ordered containers. + * Added a possibility to suspend task execution at a specific point + and resume it later. + + Bugs fixed + * Fixed the emplace() method of concurrent unordered containers to + destroy a temporary element that was not inserted. + * Fixed a bug in the merge() method of concurrent unordered + containers. + * Fixed behavior of a continue_node that follows buffering nodes. + * Added support for move-only types to tbb::parallel_pipeline + * Fixed detection of clang version when CUDA toolkit is installed +- Refresh patches: + * cmake-remove-include-path.patch + * disable-irml.patch + * optflags.patch + ------------------------------------------------------------------- Fri Jun 7 10:44:30 UTC 2019 - Ismail Dönmez diff --git a/tbb.spec b/tbb.spec index 016a914..2edc246 100644 --- a/tbb.spec +++ b/tbb.spec @@ -16,7 +16,7 @@ # -%define rel_ver 2019_U8 +%define rel_ver 2019_U9 %define so_ver 2 %bcond_with python2