diff options
author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-18 20:31:25 +0000 |
---|---|---|
committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-18 20:31:25 +0000 |
commit | 91a2adbaeec76b4ee172123a5a833065f910f5ab (patch) | |
tree | 3d3960cb7139bf1b824b4dc296e78c1380a6a1ba /src/Hasse_complex/include/gudhi/Hasse_complex.h | |
parent | 5776d22f10e8d117fbee8a4652007f26a3d5145d (diff) |
Also use TBB to build Hasse_complex in parallel.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tbb@870 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 6633f9b8261cfb2acfb62d1f4748df73375086bd
Diffstat (limited to 'src/Hasse_complex/include/gudhi/Hasse_complex.h')
-rw-r--r-- | src/Hasse_complex/include/gudhi/Hasse_complex.h | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/Hasse_complex/include/gudhi/Hasse_complex.h b/src/Hasse_complex/include/gudhi/Hasse_complex.h index 67079687..af9ae5e9 100644 --- a/src/Hasse_complex/include/gudhi/Hasse_complex.h +++ b/src/Hasse_complex/include/gudhi/Hasse_complex.h @@ -29,6 +29,12 @@ #include <utility> // for pair #include <vector> +#include <gudhi/allocator.h> + +#ifdef GUDHI_USE_TBB +#include <tbb/parallel_for.h> +#endif + namespace Gudhi { template < class HasseCpx > @@ -97,20 +103,24 @@ class Hasse_complex { template < class Complex_ds > Hasse_complex(Complex_ds & cpx) - : complex_() + : complex_(cpx.num_simplices()) , vertices_() , threshold_(cpx.filtration()) , num_vertices_() , dim_max_(cpx.dimension()) { - complex_.reserve(cpx.num_simplices()); - int idx = 0; - for (auto cpx_sh : cpx.filtration_simplex_range()) { - complex_.push_back(Hasse_simp(cpx, cpx_sh)); - if (dimension(idx) == 0) { + int size = complex_.size(); +#ifdef GUDHI_USE_TBB + tbb::parallel_for(0,size,[&](int idx){new (&complex_[idx]) Hasse_simp(cpx, cpx.simplex(idx));}); + for (int idx=0; idx<size; ++idx) + if (complex_[idx].boundary_.empty()) + vertices_.push_back(idx); +#else + for (int idx=0; idx<size; ++idx) { + new (&complex_[idx]) Hasse_simp(cpx, cpx.simplex(idx)); + if (complex_[idx].boundary_.empty()) vertices_.push_back(idx); - } - ++idx; } +#endif } Hasse_complex() @@ -194,7 +204,7 @@ class Hasse_complex { } } - std::vector< Hasse_simp > complex_; + std::vector< Hasse_simp, Gudhi::no_init_allocator<Hasse_simp> > complex_; std::vector<Simplex_handle> vertices_; Filtration_value threshold_; size_t num_vertices_; @@ -218,7 +228,7 @@ std::istream& operator>>(std::istream & is // read all simplices in the file as a list of vertices while (read_hasse_simplex(is, boundary, fil)) { // insert every simplex in the simplex tree - hcpx.complex_.push_back(Hasse_simplex< Hasse_complex<T1, T2, T3> >(key, fil, boundary)); + hcpx.complex_.emplace_back(key, fil, boundary); if (max_dim < hcpx.dimension(key)) { max_dim = hcpx.dimension(key); |