Skip to content

Commit

Permalink
Committing Intel(R) TBB 2017 Update 5 source code
Browse files Browse the repository at this point in the history
  • Loading branch information
tbbdev committed Mar 3, 2017
1 parent dc82836 commit 1d5d04c
Show file tree
Hide file tree
Showing 49 changed files with 436 additions and 378 deletions.
30 changes: 28 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,31 @@
The list of most significant changes made over time in
Intel(R) Threading Building Blocks (Intel(R) TBB).

Intel TBB 2017 Update 5
TBB_INTERFACE_VERSION == 9105

Changes (w.r.t. Intel TBB 2017 Update 4):

- Added support for Microsoft* Visual Studio* 2017.
- Added graph/matmult example to demonstrate support for compute offload
to Intel(R) Graphics Technology in the flow graph API.
- The "compiler" build option now allows to specify a full path to the
compiler.

Changes affecting backward compatibility:

- Constructors for many classes, including graph nodes, concurrent
containers, thread-local containers, etc., are declared explicit and
cannot be used for implicit conversions anymore.

Bugs fixed:

- Added a workaround for bug 16657 in the GNU C Library (glibc)
affecting the debug version of tbb::mutex.
- Fixed a crash in pool_identify() called for an object allocated in
another thread.

------------------------------------------------------------------------
Intel TBB 2017 Update 4
TBB_INTERFACE_VERSION == 9104

Expand Down Expand Up @@ -2288,7 +2313,8 @@ Packaging:
are provided separately on Intel(R) Premier.

------------------------------------------------------------------------
Intel and Cilk are registered trademarks or trademarks of Intel Corporation or its
subsidiaries in the United States and other countries.
Intel, the Intel logo, Xeon, Intel Xeon Phi, and Cilk are registered
trademarks or trademarks of Intel Corporation or its subsidiaries in
the United States and other countries.

* Other names and brands may be claimed as the property of others.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Intel(R) Threading Building Blocks 2017 Update 4
[![Stable release](https://img.shields.io/badge/version-2017_U4-green.svg)] (https://github.com/01org/tbb/releases/tag/2017_U4)
# Intel(R) Threading Building Blocks 2017 Update 5
[![Stable release](https://img.shields.io/badge/version-2017_U5-green.svg)] (https://github.com/01org/tbb/releases/tag/2017_U5)
[![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE)

Intel(R) Threading Building Blocks (Intel(R) TBB) lets you easily write parallel C++ programs that take
Expand Down
14 changes: 8 additions & 6 deletions build/Makefile.test
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,14 @@ $(TWICE_LINKED_TESTS): LINK_FILES+=$(@:.$(TEST_EXT)=_secondary.$(OBJ))
test_dynamic_link%.$(TEST_EXT): LINK_TBB.LIB =
test_dynamic_link.$(TEST_EXT): LIBS += $(LIBDL)

TEST_BIG_OBJ = test_opencl_node.$(TEST_EXT) test_join_node.$(TEST_EXT) test_atomic.$(TEST_EXT)

ifeq (windows_windows,$(tbb_os)_$(target))
ifneq (gcc,$(compiler))
$(TEST_BIG_OBJ): override CXXFLAGS += /bigobj
endif
# Resolving issue with the number of sections that an object file can contain
ifneq (,$(BIGOBJ_KEY))
TEST_BIGOBJ = test_opencl_node.$(TEST_EXT) \
test_join_node.$(TEST_EXT) \
test_atomic.$(TEST_EXT) \
test_concurrent_unordered_set.$(TEST_EXT) \
test_concurrent_unordered_map.$(TEST_EXT)
$(TEST_BIGOBJ): override CXXFLAGS += $(BIGOBJ_KEY)
endif

# TODO: remove repetition of .$(TEST_EXT) in the list bellow
Expand Down
16 changes: 8 additions & 8 deletions build/common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ endif

ifdef cpp0x
$(warning "Warning: deprecated cpp0x=$(cpp0x) is used, stdver must be used instead. Building in stdver=c++0x mode.")
export stdver ?= c++0x
export stdver?=c++0x
override cpp0x=
endif

Expand All @@ -54,13 +54,13 @@ ifneq (,$(stdver))
$(warning "Warning: unexpected stdver=$(stdver) is used.")
endif

CXX_STD_FLAGS = -std=$(stdver) -D_TBB_CPP0X
CXX_STD_FLAGS=-std=$(stdver) -D_TBB_CPP0X
endif

# The requested option is added unconditionally.
# If it is not supported, a compiler warning or error is expected.
# Note that CXX_STD_FLAGS can be changed in <os>.<compiler>.inc.
CXX_ONLY_FLAGS += $(CXX_STD_FLAGS)
CXX_ONLY_FLAGS+=$(CXX_STD_FLAGS)

ifeq (,$(wildcard $(tbb_root)/build/$(tbb_os).inc))
$(error "$(tbb_os)" is not supported. Add build/$(tbb_os).inc file with os-specific settings )
Expand Down Expand Up @@ -100,23 +100,23 @@ cross_cfg = $(if $(crosstest),$(call flip_cfg,$(1)),$(1))
# Setting default configuration to release
cfg?=release

compiler_name=$(notdir $(compiler))
ifdef BUILDING_PHASE

ifndef target
target:=$(tbb_os)
endif
# process host/target compiler-dependent build configuration
ifeq (,$(wildcard $(tbb_root)/build/$(target).$(compiler).inc))
$(error "$(compiler)" is not supported on $(target). Add build/$(target).$(compiler).inc file with compiler-specific settings. )
ifeq (,$(wildcard $(tbb_root)/build/$(target).$(compiler_name).inc))
$(error "$(compiler_name)" is not supported on $(target). Add build/$(target).$(compiler_name).inc file with compiler-specific settings. )
endif
include $(tbb_root)/build/$(target).$(compiler).inc
include $(tbb_root)/build/$(target).$(compiler_name).inc
endif

ifneq ($(BUILDING_PHASE),1)
# definitions for top-level Makefiles
origin_build_dir:=$(origin tbb_build_dir)
tbb_build_dir?=$(tbb_root)$(SLASH)build
export tbb_build_prefix?=$(tbb_os)_$(arch)_$(compiler)_$(runtime)$(CPF_SUFFIX)
export tbb_build_prefix?=$(tbb_os)_$(arch)_$(compiler_name)_$(runtime)$(CPF_SUFFIX)
work_dir=$(tbb_build_dir)$(SLASH)$(tbb_build_prefix)
endif # BUILDING_PHASE != 1

Expand Down
Loading

0 comments on commit 1d5d04c

Please sign in to comment.