From a273a425372017288e758c59f6ab0a7304d80d81 Mon Sep 17 00:00:00 2001 From: Johannes Singler Date: Wed, 7 May 2008 11:14:05 +0000 Subject: [PATCH] quicksort.h: (parallel_sort_qs_conquer) Explicitly request number of threads in the parallel... 2008-05-07 Johannes Singler * include/parallel/quicksort.h: (parallel_sort_qs_conquer) Explicitly request number of threads in the parallel clause. (parallel_sort_qs) Remove setting the number of threads globally. From-SVN: r135038 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/parallel/quicksort.h | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ecba4a379a9..6bc43b87a58 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2008-05-07 Johannes Singler + + * include/parallel/quicksort.h: + (parallel_sort_qs_conquer) Explicitly request number of threads + in the parallel clause. + (parallel_sort_qs) Remove setting the number of threads globally. + 2008-05-06 Benjamin Kosnik * include/std/mutex (mutex::mutex): Fix usage of initializing macro. diff --git a/libstdc++-v3/include/parallel/quicksort.h b/libstdc++-v3/include/parallel/quicksort.h index 8ef5b7c03c6..844a5bf3ccd 100644 --- a/libstdc++-v3/include/parallel/quicksort.h +++ b/libstdc++-v3/include/parallel/quicksort.h @@ -138,7 +138,7 @@ namespace __gnu_parallel _Settings::get().sort_qs_num_samples_preset, num_threads); -#pragma omp parallel sections +#pragma omp parallel sections num_threads(2) { #pragma omp section parallel_sort_qs_conquer(begin, begin + split, @@ -177,9 +177,6 @@ namespace __gnu_parallel if (num_threads > n) num_threads = static_cast(n); - // Hard to avoid. - omp_set_num_threads(num_threads); - parallel_sort_qs_conquer(begin, begin + n, comp, num_threads); } -- 2.30.2