diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-08 10:41:29 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-08 10:41:29 +0000 |
| commit | d3280484c8faa248ac2834401272d8b53b6d1866 (patch) | |
| tree | af694174aed0afec21a6e2c4fde2653d5f5e104e /src/Simplex_tree | |
| parent | d91d9248c66451a765f58b6d03db2124b52c3ae2 (diff) | |
| parent | de4811fa72c90b38357bbddec3d2ea5b282642b3 (diff) | |
tbb branch merge. Link with Intel TBB for parallel programmation.
Reduce persistence UT timings.
Add parallel_rips_persistence compilatino and test.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@954 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 4623c6a0c31d2b9574e2bb33836261fc26a89555
Diffstat (limited to 'src/Simplex_tree')
| -rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index 50c67185..356deb3a 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -35,6 +35,10 @@ #include <boost/iterator/transform_iterator.hpp> #include <boost/graph/adjacency_list.hpp> +#ifdef GUDHI_USE_TBB +#include <tbb/parallel_sort.h> +#endif + #include <algorithm> #include <utility> #include <vector> @@ -794,8 +798,12 @@ class Simplex_tree { * heuristic consists in inserting the cofaces of a simplex as soon as * possible. */ +#ifdef GUDHI_USE_TBB + tbb::parallel_sort(filtration_vect_, is_before_in_filtration(this)); +#else std::stable_sort(filtration_vect_.begin(), filtration_vect_.end(), is_before_in_filtration(this)); +#endif } private: |