Skip to content

Commit b345248

Browse files
author
tbbdev
committed
Committing Intel(R) TBB 2017 Update 2 source code
1 parent a602c7d commit b345248

File tree

106 files changed

+10000
-9379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+10000
-9379
lines changed

.gitattributes

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files you want to always be normalized and converted
5+
# to native line endings on checkout.
6+
*.c text
7+
*.h text
8+
*.cpp text
9+
*.def text
10+
*.rc text
11+
*.i text
12+
*.sh text
13+
*.csh text
14+
*.mk text
15+
*.java text
16+
*.csv text
17+
*.lst text
18+
*.asm text
19+
*.cfg text
20+
*.css text
21+
*.inc text
22+
*.js text
23+
*.rb text
24+
*.strings text
25+
*.txt text
26+
*export.lst text
27+
*.xml text
28+
*.py text
29+
*.md text
30+
*.classpath text
31+
*.cproject text
32+
*.project text
33+
*.properties text
34+
*.java text
35+
*.gradle text
36+
37+
# Declare files that will always have CRLF line endings on checkout.
38+
*.sln text eol=crlf
39+
*.bat text eol=crlf
40+
41+
# Denote all files that are truly binary and should not be modified.
42+
*.png binary
43+
*.jpg binary
44+
*.ico binary
45+
*.spir binary

.gitignore

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# Ignore the debug and release directories created with Makefile builds #
2+
#########################################################################
3+
build/*_debug/
4+
build/*_release/
5+
6+
# Compiled source #
7+
###################
8+
*.com
9+
*.class
10+
*.dll
11+
*.lib
12+
*.pdb
13+
*.exe
14+
*.o
15+
*.so
16+
*.so.1
17+
*.so.2
18+
*.dylib
19+
*.a
20+
*.obj
21+
*.pyc
22+
23+
*.orig
24+
*.raw
25+
*.sample
26+
*.slo
27+
*.swp
28+
*.config
29+
*.la
30+
*.lai
31+
*.lo
32+
*.nhdr
33+
*.nii.gz
34+
*.nrrd
35+
36+
# Packages #
37+
############
38+
# it's better to unpack these files and commit the raw source
39+
# git has its own built in compression methods
40+
*.7z
41+
*.dmg
42+
*.gz
43+
*.iso
44+
*.jar
45+
*.rar
46+
*.tar
47+
*.tgz
48+
*.zip
49+
50+
# Logs and databases #
51+
######################
52+
*.log
53+
*.sql
54+
*.sqlite
55+
56+
# OS generated files #
57+
######################
58+
.DS_Store
59+
.DS_Store?
60+
._*
61+
.Spotlight-V100
62+
.Trashes
63+
ehthumbs.db
64+
Thumbs.db
65+
66+
# IDE generated files #
67+
######################
68+
/.ninja_deps
69+
/.ninja_log
70+
/build.ninja
71+
/rules.ninja
72+
*~
73+
.emacs.desktop
74+
75+
# Build system generated files #
76+
################################
77+
CMakeCache.txt
78+
CMakeFiles/
79+
80+
# Other #
81+
#########
82+
.clang_complete
83+
.idea
84+
.svn
85+
crash*
86+
*.tmp

CHANGES

+14
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
The list of most significant changes made over time in
33
Intel(R) Threading Building Blocks (Intel(R) TBB).
44

5+
Intel TBB 2017 Update 2
6+
TBB_INTERFACE_VERSION == 9102
7+
8+
Changes (w.r.t. Intel TBB 2017 Update 1):
9+
10+
- Removed the long-outdated support for Xbox* consoles.
11+
12+
Bugs fixed:
13+
14+
- Fixed the issue with task_arena::execute() not being processed when
15+
the calling thread cannot join the arena.
16+
- Fixed dynamic memory allocation replacement failure on macOS* 10.12.
17+
18+
------------------------------------------------------------------------
519
Intel TBB 2017 Update 1
620
TBB_INTERFACE_VERSION == 9101
721

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Intel(R) Threading Building Blocks 2017 Update 1
2-
[![Stable release](https://img.shields.io/badge/version-2017_U1-green.svg)] (https://github.com/01org/tbb/releases/tag/2017_U1)
1+
# Intel(R) Threading Building Blocks 2017 Update 2
2+
[![Stable release](https://img.shields.io/badge/version-2017_U2-green.svg)] (https://github.com/01org/tbb/releases/tag/2017_U2)
33
[![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE)
44

55
Intel(R) Threading Building Blocks (Intel(R) TBB) lets you easily write parallel C++ programs that take

build/generate_tbbvars.bat

-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ set fslash_bin_dir=%bin_dir:\=/%
2626
set _INCLUDE=INCLUDE& set _LIB=LIB
2727
if not x%UNIXMODE%==x set _INCLUDE=CPATH& set _LIB=LIBRARY_PATH
2828

29-
if exist tbbvars.bat goto skipbat
3029
echo Generating local tbbvars.bat
3130
echo @echo off>tbbvars.bat
3231
echo SET TBBROOT=%actual_root%>>tbbvars.bat
@@ -36,9 +35,7 @@ echo SET %_INCLUDE%=%%TBBROOT%%\include;%%%_INCLUDE%%%>>tbbvars.bat
3635
echo SET %_LIB%=%bin_dir%;%%%_LIB%%%>>tbbvars.bat
3736
echo SET PATH=%bin_dir%;%%PATH%%>>tbbvars.bat
3837
if not x%UNIXMODE%==x echo SET LD_LIBRARY_PATH=%bin_dir%;%%LD_LIBRARY_PATH%%>>tbbvars.bat
39-
:skipbat
4038

41-
if exist tbbvars.sh goto skipsh
4239
echo Generating local tbbvars.sh
4340
echo #!/bin/sh>tbbvars.sh
4441
echo export TBBROOT="%fslash_root%">>tbbvars.sh
@@ -48,9 +45,7 @@ echo export %_INCLUDE%="${TBBROOT}/include;$%_INCLUDE%">>tbbvars.sh
4845
echo export %_LIB%="%fslash_bin_dir%;$%_LIB%">>tbbvars.sh
4946
echo export PATH="%fslash_bin_dir%;$PATH">>tbbvars.sh
5047
if not x%UNIXMODE%==x echo export LD_LIBRARY_PATH="%fslash_bin_dir%;$LD_LIBRARY_PATH">>tbbvars.sh
51-
:skipsh
5248

53-
if exist tbbvars.csh goto skipcsh
5449
echo Generating local tbbvars.csh
5550
echo #!/bin/csh>tbbvars.csh
5651
echo setenv TBBROOT "%actual_root%">>tbbvars.csh
@@ -60,7 +55,6 @@ echo setenv %_INCLUDE% "${TBBROOT}\include;$%_INCLUDE%">>tbbvars.csh
6055
echo setenv %_LIB% "%bin_dir%;$%_LIB%">>tbbvars.csh
6156
echo setenv PATH "%bin_dir%;$PATH">>tbbvars.csh
6257
if not x%UNIXMODE%==x echo setenv LD_LIBRARY_PATH "%bin_dir%;$LD_LIBRARY_PATH">>tbbvars.csh
63-
:skipcsh
6458

6559
if not x%LIB_STL_ANDROID%==x (
6660
REM Workaround for copying Android* specific stl shared library to work folder

build/generate_tbbvars.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ bin_dir="$PWD" #
2323
cd "$tbb_root" # keep this comments here
2424
tbb_root="$PWD" # to make it unsensible
2525
cd "$bin_dir" # to EOL encoding
26-
[ -f ./tbbvars.sh ] || cat >./tbbvars.sh <<EOF
26+
cat >./tbbvars.sh <<EOF
2727
#!/bin/bash
2828
export TBBROOT="${tbb_root}" #
2929
tbb_bin="${bin_dir}" #
@@ -44,7 +44,7 @@ else #
4444
fi #
4545
${TBB_CUSTOM_VARS_SH} #
4646
EOF
47-
[ -f ./tbbvars.csh ] || cat >./tbbvars.csh <<EOF
47+
cat >./tbbvars.csh <<EOF
4848
#!/bin/csh
4949
setenv TBBROOT "${tbb_root}" #
5050
setenv tbb_bin "${bin_dir}" #

build/version_info_windows.js

-2
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,3 @@ WScript.echo( "#define __TBB_DATETIME \"" + date.toUTCString() + "\"" );
9393
WScript.echo( "#define __TBB_VERSION_YMD " + date.getUTCFullYear() + ", " +
9494
(date.getUTCMonth() > 8 ? (date.getUTCMonth()+1):("0"+(date.getUTCMonth()+1))) +
9595
(date.getUTCDate() > 9 ? date.getUTCDate():("0"+date.getUTCDate())) );
96-
97-

build/xbox360.cl.inc

-85
This file was deleted.

build/xbox360.inc

-72
This file was deleted.

doc/html/a00040.html

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)