Skip to content
Snippets Groups Projects
Commit 71feba5b authored by d74ksy's avatar d74ksy
Browse files

Turned the parallel sorts back on

parent 9c0807da
Branches
No related tags found
No related merge requests found
......@@ -2194,15 +2194,15 @@ void qsched_integrate( struct qsched *s, struct tsched *ts)
}
/* Once this is done, we need to sort out the arrays and fix the pointers to the locks/unlocks arrays.*/
// #pragma omp parallel
#pragma omp parallel
{
/* Sort the unlocks. */
// #pragma omp single nowait
#pragma omp single nowait
qsched_quicksort( s->deps , s->deps_key , s->count_deps , 0 ,0xFFFFFFFFFFFFFFF );
/* Sort the locks. */
// #pragma omp single nowait
#pragma omp single nowait
qsched_quicksort( s->locks , s->locks_key , s->count_locks , 0 , 0xFFFFFFFFFFFFFFF);
}
......@@ -3224,33 +3224,33 @@ void qsched_prepare_mpi( struct qsched *s){
count = s->count;
// count = s->res_ranks[s->count_ranks];
/* Do the sorts in parallel, if possible. */
// #pragma omp parallel
tic = getticks();
#pragma omp parallel
{
/* Sort the unlocks. */
// #pragma omp single nowait
#pragma omp single nowait
qsched_quicksort( s->deps , s->deps_key , s->count_deps , 0 , 0xFFFFFFFFFFFFFFF);
for(k = 1; k < s->count_deps; k++)
/*for(k = 1; k < s->count_deps; k++)
{
if(s->deps_key[k] < s->deps_key[k-1])
{
message("index[k] = %lli, index[k-1] = %lli, index[k-2] = %lli, index[k+1] = %lli", s->deps_key[k], s->deps_key[k-1], s->deps_key[k-2], s->deps_key[k+1]);
error("Sort didn't work correctly at index %i of %i.", k, s->count_deps);
}
}
}*/
/* Sort the locks. */
// #pragma omp single nowait
#pragma omp single nowait
qsched_quicksort( s->locks , s->locks_key , s->count_locks , 0 , 0xFFFFFFFFFFFFFFF);
/* Sort the uses. */
// #pragma omp single nowait
#pragma omp single nowait
qsched_quicksort( s->uses , s->uses_key , s->count_uses , 0 , 0xFFFFFFFFFFFFFFF );
// #pragma omp single nowait
#pragma omp single nowait
qsched_quicksort( s->users, s->users_key, s->count_users, 0, 0xFFFFFFFFFFFFFFF);
// #pragma omp single nowait
#pragma omp single nowait
qsched_quicksort( s->lockers, s->lockers_key, s->count_lockers, 0, 0xFFFFFFFFFFFFFFF);
}
......@@ -4326,13 +4326,13 @@ void qsched_quicksort (long long int *restrict data ,long long int *restrict ind
/* Recurse on the left? */
if ( j > 0 && pivot > min ) {
// #pragma omp task untied
#pragma omp task untied
qsched_quicksort( data , ind , j+1 , min , pivot );
}
/* Recurse on the right? */
if ( i < N && pivot+1 < max ) {
// #pragma omp task untied
#pragma omp task untied
qsched_quicksort( &data[i], &ind[i], N-i , pivot+1 , max );
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment