Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/base/contourForests/ContourForestsTemplate.h
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ namespace ttk {
#endif

#ifdef TTK_ENABLE_OPENMP
omp_set_nested(1);
omp_set_max_active_levels(100);
#endif

// std::cout << "NO PARALLEL DEBUG MODE" << std::endl;
Expand Down
4 changes: 2 additions & 2 deletions core/base/discreteMorseSandwichMPI/DiscreteMorseSandwichMPI.h
Original file line number Diff line number Diff line change
Expand Up @@ -6334,7 +6334,7 @@ int ttk::DiscreteMorseSandwichMPI::computePersistencePairs(
int minSadThreadNumber = std::max(1, static_cast<int>(threadNumber_ / 2));
int maxSadThreadNumber = std::max(1, threadNumber_ - minSadThreadNumber);
int taskNumber = std::min(2, threadNumber_);
omp_set_nested(1);
omp_set_max_active_levels(100);
std::vector<PersistencePair> sadMaxPairs;
MPI_Comm minSadComm;
MPI_Comm_dup(ttk::MPIcomm_, &minSadComm);
Expand All @@ -6358,7 +6358,7 @@ int ttk::DiscreteMorseSandwichMPI::computePersistencePairs(
ignoreBoundary, offsets, sadMaxComm, maxSadThreadNumber);
}
}
omp_set_nested(0);
omp_set_max_active_levels(1);
MPI_Comm_free(&minSadComm);
MPI_Comm_free(&sadMaxComm);
pairs.insert(pairs.end(), sadMaxPairs.begin(), sadMaxPairs.end());
Expand Down
2 changes: 1 addition & 1 deletion core/base/ftmTree/FTMTree_Template.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void ttk::ftm::FTMTree::build(const triangulationType *mesh) {

#ifdef TTK_ENABLE_OPENMP
ParallelGuard const pg{threadNumber_};
omp_set_nested(1);
omp_set_max_active_levels(100);
#ifdef TTK_ENABLE_OMP_PRIORITY
if(omp_get_max_task_priority() < 5) {
this->printWrn("OpenMP max priority is lower than 5");
Expand Down
2 changes: 1 addition & 1 deletion core/base/ftrGraph/FTRGraph_Template.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace ttk {

#ifdef TTK_ENABLE_OPENMP
ParallelGuard const pg{params_.threadNumber};
omp_set_nested(1);
omp_set_max_active_levels(100);
#ifdef TTK_ENABLE_OMP_PRIORITY
if(omp_get_max_task_priority() < PriorityLevel::Max) {
this->printWrn("OpenMP max priority is lower than 5");
Expand Down
6 changes: 3 additions & 3 deletions core/base/mergeTreeAutoencoder/MergeTreeAutoencoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2609,8 +2609,8 @@ void ttk::MergeTreeAutoencoder::execute(
printErr("This module requires Torch.");
#else
#ifdef TTK_ENABLE_OPENMP
int ompNested = omp_get_nested();
omp_set_nested(1);
int ompNested = omp_get_max_active_levels();
omp_set_max_active_levels(100);
#endif
// --- Preprocessing
Timer t_preprocess;
Expand Down Expand Up @@ -2697,7 +2697,7 @@ void ttk::MergeTreeAutoencoder::execute(
}
}
#ifdef TTK_ENABLE_OPENMP
omp_set_nested(ompNested);
omp_set_max_active_levels(ompNested);
#endif
#endif
}
2 changes: 1 addition & 1 deletion core/base/mergeTreeClustering/MergeTreeBarycenter.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace ttk {
"MergeTreeBarycenter"); // inherited from Debug: prefix will be printed
// at the beginning of every msg
#ifdef TTK_ENABLE_OPENMP4
omp_set_nested(1);
omp_set_max_active_levels(100);
#endif
}
~MergeTreeBarycenter() override = default;
Expand Down
2 changes: 1 addition & 1 deletion core/base/mergeTreeClustering/MergeTreeDistance.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace ttk {
"MergeTreeDistance"); // inherited from Debug: prefix will be printed at
// the beginning of every msg
#ifdef TTK_ENABLE_OPENMP4
omp_set_nested(1);
omp_set_max_active_levels(100);
#endif
}
~MergeTreeDistance() override = default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ namespace ttk {
// msg
this->setDebugMsgPrefix("MergeTreePrincipalGeodesics");
#ifdef TTK_ENABLE_OPENMP
omp_set_nested(1);
omp_set_max_active_levels(100);
#endif
}

Expand Down
Loading