diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-02-05 07:43:52 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-02-05 07:43:52 +0100 |
commit | 8e888b8be306c32c561396ca80b47a0aa9f9f859 (patch) | |
tree | c745eca4eeeeeac45551e80e3732b78e42759c7c /src/Nerve_GIC | |
parent | bf4b4eeda9762ed9e99c2b24f19331fa0111fcfe (diff) | |
parent | 33540d9b4c4d320ee1482d876a10200d89ff4f49 (diff) |
Merge last master modification and fix merge conflict
Diffstat (limited to 'src/Nerve_GIC')
-rw-r--r-- | src/Nerve_GIC/include/gudhi/GIC.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h index ab099c04..61db6508 100644 --- a/src/Nerve_GIC/include/gudhi/GIC.h +++ b/src/Nerve_GIC/include/gudhi/GIC.h @@ -14,7 +14,7 @@ #ifdef GUDHI_USE_TBB #include <tbb/parallel_for.h> -#include <tbb/mutex.h> +#include <mutex> #endif #include <gudhi/Debug_utils.h> @@ -459,7 +459,7 @@ class Cover_complex { // This cannot be parallelized if thread_local is not defined // thread_local is not defined for XCode < v.8 #if defined(GUDHI_USE_TBB) && defined(GUDHI_CAN_USE_CXX11_THREAD_LOCAL) - tbb::mutex deltamutex; + std::mutex deltamutex; tbb::parallel_for(0, N, [&](int i){ std::vector<int> samples(m); SampleWithoutReplacement(n, m, samples); @@ -765,7 +765,7 @@ class Cover_complex { #ifdef GUDHI_USE_TBB if (verbose) std::clog << "Computing connected components (parallelized)..." << std::endl; - tbb::mutex covermutex, idmutex; + std::mutex covermutex, idmutex; tbb::parallel_for(0, res, [&](int i){ // Compute connected components Graph G = one_skeleton.create_subgraph(); @@ -895,7 +895,7 @@ class Cover_complex { // Compute the geodesic distances to subsamples with Dijkstra #ifdef GUDHI_USE_TBB if (verbose) std::clog << "Computing geodesic distances (parallelized)..." << std::endl; - tbb::mutex coverMutex; tbb::mutex mindistMutex; + std::mutex coverMutex; tbb::mutex mindistMutex; tbb::parallel_for(0, m, [&](int i){ int seed = voronoi_subsamples[i]; std::vector<double> dmap(n); |