From 16075ee2679344e8e32bb47e6471d1e3c7f507ba Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 30 Jan 2012 15:17:51 +0100 Subject: [PATCH] re-add openmp --- merge/sort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge/sort.c b/merge/sort.c index aae6c4a..2146652 100644 --- a/merge/sort.c +++ b/merge/sort.c @@ -66,7 +66,7 @@ int main ( int argc, char ** argv) { startTime = omp_get_wtime(); block = n/p; - //#pragma omp parallel for shared(a,b,c,n,m,p,block) private(i,b_len,b_len_begin,b_len_end) + #pragma omp parallel for shared(a,b,c,n,m,p,block) private(i,b_len,b_len_begin,b_len_end) for (i = 0; i < p; i++) { b_len_begin = rank(a[i*block],b,m); b_len_end = rank(a[(i+1)*block],b,m); -- 2.43.0