diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7784470d57e62fbbd5f82143f4497872b16e8c9b..66511e61183f7eb10fbb66b39599589f2877e13b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -359,14 +359,6 @@ if(MSVC) endif() ROOT_ADD_TEST(test-TFormulaTests COMMAND TFormulaTests FAILREGEX "FAILED|Error in") -#--TBB basic test---------------------------------------------------------------------------------- -if(ROOT_imt_FOUND) - include_directories(${TBB_INCLUDE_DIRS}) - ROOT_EXECUTABLE(testTBB testTBB.cxx LIBRARIES ${TBB_LIBRARIES} BUILTINS TBB) - set_target_properties(testTBB PROPERTIES COMPILE_FLAGS "${TBB_CXXFLAGS}") - ROOT_ADD_TEST(test-TBB COMMAND testTBB FAILREGEX "FAILED|Error in") -endif() - #--Vc basic test----------------------------------------------------------------------------------- if(ROOT_vc_FOUND) ROOT_EXECUTABLE(testVc testVc.cxx LIBRARIES ${Vc_LIBRARIES} BUILTINS Vc) diff --git a/test/testTBB.cxx b/test/testTBB.cxx deleted file mode 100644 index 1f7cb9acf5c8dccdc5b5496098dfa2861b5c562d..0000000000000000000000000000000000000000 --- a/test/testTBB.cxx +++ /dev/null @@ -1,36 +0,0 @@ -#include "tbb/parallel_for.h" -#include "tbb/task_scheduler_init.h" -#include <iostream> -#include <vector> - -struct mytask { - mytask(size_t n) - :_n(n) - {} - void operator()() { - for (int i=0;i<1000000;++i) {} // Deliberately run slow - std::cerr << "[" << _n << "]"; - } - size_t _n; -}; - -int main(int,char**) { - - //tbb::task_scheduler_init init; // Automatic number of threads - tbb::task_scheduler_init init(tbb::task_scheduler_init::default_num_threads()); // Explicit number of threads - - std::vector<mytask> tasks; - for (int i=0;i<1000;++i) - tasks.push_back(mytask(i)); - - tbb::parallel_for( - tbb::blocked_range<size_t>(0,tasks.size()), - [&tasks](const tbb::blocked_range<size_t>& r) { - for (size_t i=r.begin();i<r.end();++i) tasks[i](); - } - ); - - std::cerr << std::endl; - - return 0; -}