From 87e6b137652744ffbc00d086d989c860ec9a9f94 Mon Sep 17 00:00:00 2001 From: Fabien Servant Date: Wed, 18 Jun 2025 12:29:41 +0200 Subject: [PATCH] replace omp_set_nested with omp_set_max_active_levels --- src/aliceVision/alicevision_omp.hpp | 2 +- src/aliceVision/featureEngine/FeatureExtractor.cpp | 2 +- src/aliceVision/fuseCut/PointCloud.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/aliceVision/alicevision_omp.hpp b/src/aliceVision/alicevision_omp.hpp index 8475e1b6b1..ac02646c6d 100644 --- a/src/aliceVision/alicevision_omp.hpp +++ b/src/aliceVision/alicevision_omp.hpp @@ -17,7 +17,7 @@ inline int omp_get_thread_num() { return 0; } inline int omp_get_max_threads() { return 1; } inline void omp_set_num_threads(int num_threads) {} inline int omp_get_num_procs() { return 1; } -inline void omp_set_nested(int nested) {} +inline void omp_set_max_active_levels(int levels) {} inline void omp_init_lock(omp_lock_t* lock) {} inline void omp_destroy_lock(omp_lock_t* lock) {} diff --git a/src/aliceVision/featureEngine/FeatureExtractor.cpp b/src/aliceVision/featureEngine/FeatureExtractor.cpp index b79c2b2092..8c0932e062 100644 --- a/src/aliceVision/featureEngine/FeatureExtractor.cpp +++ b/src/aliceVision/featureEngine/FeatureExtractor.cpp @@ -147,7 +147,7 @@ void FeatureExtractor::process(const HardwareContext& hContext, const image::EIm nbThreads = std::min(cpuJobs.size(), nbThreads); ALICEVISION_LOG_INFO("# threads for extraction: " << nbThreads); - omp_set_nested(1); + omp_set_max_active_levels(2); #pragma omp parallel for num_threads(nbThreads) for (int i = 0; i < cpuJobs.size(); ++i) diff --git a/src/aliceVision/fuseCut/PointCloud.cpp b/src/aliceVision/fuseCut/PointCloud.cpp index 133ce0dcf9..cf549c6571 100644 --- a/src/aliceVision/fuseCut/PointCloud.cpp +++ b/src/aliceVision/fuseCut/PointCloud.cpp @@ -139,7 +139,7 @@ void createVerticesWithVisibilities(const StaticVector& cams, for (auto& lock : locks) omp_init_lock(&lock); - omp_set_nested(1); + omp_set_max_active_levels(2); #pragma omp parallel for num_threads(3) for (int c = 0; c < cams.size(); ++c) { @@ -227,7 +227,7 @@ void createVerticesWithVisibilities(const StaticVector& cams, } } } - omp_set_nested(0); + omp_set_max_active_levels(1); for (auto& lock : locks) omp_destroy_lock(&lock); @@ -292,7 +292,7 @@ void PointCloud::fuseFromDepthMaps(const StaticVector& cams, const Point3d ALICEVISION_LOG_INFO("Load depth maps and add points."); { - omp_set_nested(1); + omp_set_max_active_levels(2); #pragma omp parallel for num_threads(3) for (int c = 0; c < cams.size(); c++) { @@ -422,7 +422,7 @@ void PointCloud::fuseFromDepthMaps(const StaticVector& cams, const Point3d } } } - omp_set_nested(0); + omp_set_max_active_levels(1); } ALICEVISION_LOG_INFO("Filter initial 3D points by pixel size to remove duplicates.");