This directory contains common code that is used in the Intel® Threading Building Blocks (Intel® TBB) samples.
@@ -332,7 +332,7 @@ See the examples that use the GUI (stereo, - tachyon, + tachyon, seismic, fractal) for more details. @@ -360,21 +360,23 @@

Most Intel TBB examples allow to specify n-of-threads, the set of thread numbers that should be used to run an example.
Usually, it is a range of the form low[:high[:(+|*|#)S]], where low and optional high - are non-negative integers or 'auto' for the default choice, and optional step expression (+|*|#)S + are non-negative integers or 'auto' for the default choice, and optional step expression (+|*|#)S specifies how thread numbers are chosen within the range:

• With +/*, the previous number is incremented/multiplied by S. E.g., expression '12:16:+1' means 12,13,14,15,16 threads, and '1:16:*2' means 1,2,4,8,16 threads.
• With #, S is the desired number of steps between any subsequent powers of 2; - it must be a power of 2 on its own, with most meaningful values being 2, 4, and 8. + it must be a power of 2 on its own, with most meaningful values being 2, 4, and 8. For a given number of threads, the actual step value is computed as the quotient of the nearest smaller power of 2 divided by the number of steps, but is at least 1. E.g., '1:32:#4' means 1,2,3,4,5,6,7,8,10,12,14,16,20,24,28,32 threads; note the step doubling at 8 and 16 to keep 4 steps between powers of 2.
A default value for the number of threads can be customized in an example. If not customized, it is '1:auto:#4'. - The 'auto' parameter is substituted with a value returned by a specified function, which typically is - `tbb::task_scheduler_init::default_num_threads()`. + The 'auto' parameter is substituted with a value returned by a specified function + (this function is typically `utility::get_default_num_threads()`, which returns a copy of + constant that was initialized with `tbb::global_control::active_value(tbb::global_control::max_allowed_parallelism)` + at the start of the program).

@@ -388,7 +390,7 @@

Intel and the Intel logo are trademarks of Intel Corporation in the U.S. and/or other countries. -
* Other names and brands may be claimed as the property of others. +
* Other names and brands may be claimed as the property of others.

- This directory has examples of the `pipeline` algorithm. + This directory has examples of the `parallel_pipeline` algorithm.

@@ -334,7 +334,7 @@

Intel and the Intel logo are trademarks of Intel Corporation in the U.S. and/or other countries. -
* Other names and brands may be claimed as the property of others. +
* Other names and brands may be claimed as the property of others.

- Text filter that demonstrates class pipeline. Example program reads a file + Text filter that demonstrates the use of parallel_pipeline. Example program reads a file containing decimal integers in text format, and changes each to its square.

@@ -325,7 +325,7 @@

- +
Files
@@ -378,7 +378,7 @@
square -h
Prints the help for command line options
square [n-of-threads=value] [input-file=value] [output-file=value] [max-slice-size=value] [silent] -
square [n-of-threads [input-file [output-file [max-slice-size]]]] [silent] +
square [n-of-threads [input-file [output-file [max-slice-size]]]] [silent]
n-of-threads is the number of threads to use; a range of the form low[:high], where low and optional high are non-negative integers or 'auto' for a platform-specific default number.
input-file is an input file name.
output-file is an output file name.
@@ -397,7 +397,7 @@
- +
Up to parent directory
@@ -407,11 +407,11 @@

Intel and the Intel logo are trademarks of Intel Corporation in the U.S. and/or other countries. -
* Other names and brands may be claimed as the property of others. +
* Other names and brands may be claimed as the property of others.

- The example calculates two classical Mandelbrot fractals with different priorities. + The example calculates two classical Mandelbrot fractals with different concurrency levels.

- The application window is divided into two areas where fractals are rendered. With mouse click on an area the user can change the priority of the calculating fractal. In the clicked area the fractal priority is changed to be "high" and the priority of the other fractal is changed to "low". The fractal with "high" priority we will call active. - The example also has the console mode but in this mode the priorities could not be changed during execution. + The application window is divided into two areas where fractals are rendered. + The example also has the console mode.

@@ -403,9 +403,7 @@

<left mouse button> -
Make the fractal active and change its priority to high -
<space> -
Switch priorities +
Make the fractal active
<w>
Move the active fractal up
<a> diff --git a/examples/task_arena/fractal/xcode/fractal.xcodeproj/project.pbxproj b/examples/task_arena/fractal/xcode/fractal.xcodeproj/project.pbxproj index 6f087b71b58be26e1957995655c99bc2287b735d..67424370183978b3d05b33d2be00ec3f52c28235 100644 --- a/examples/task_arena/fractal/xcode/fractal.xcodeproj/project.pbxproj +++ b/examples/task_arena/fractal/xcode/fractal.xcodeproj/project.pbxproj @@ -332,6 +332,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -397,6 +398,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -492,7 +494,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++11"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -537,7 +539,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++11"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_WARN_BOOL_CONVERSION = YES; diff --git a/examples/task_arena/index.html b/examples/task_arena/index.html index e24419352e558c5b732085c3525c9673353ecf5a..e19bb953181988aba56d53c1da8f755a715fe747 100644 --- a/examples/task_arena/index.html +++ b/examples/task_arena/index.html @@ -321,7 +321,7 @@
fractal -
The example calculates two classical Mandelbrot fractals with different priorities. +
The example calculates two classical Mandelbrot fractals with different concurrency limits.