From 64a26385d36a0842a9cd7ddf0a94b88380b2e4c9 Mon Sep 17 00:00:00 2001 From: Pedro Gonnet <gonnet@google.com> Date: Tue, 25 Oct 2016 23:01:56 +0200 Subject: [PATCH] ran format.sh. --- src/scheduler.c | 16 +++++++--------- src/task.h | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/scheduler.c b/src/scheduler.c index 27dfdb4659..c656470cb5 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -930,32 +930,30 @@ void scheduler_reweight(struct scheduler *s, int verbose) { switch (t->type) { case task_type_sort: cost = wscale * intrinsics_popcount(t->flags) * t->ci->count * - (sizeof(int) * 8 - intrinsics_clz(t->ci->count)); + (sizeof(int) * 8 - intrinsics_clz(t->ci->count)); break; case task_type_self: cost = 1 * wscale * t->ci->count * t->ci->count; break; case task_type_pair: if (t->ci->nodeID != nodeID || t->cj->nodeID != nodeID) - cost = - 3 * wscale * t->ci->count * t->cj->count * sid_scale[t->flags]; + cost = 3 * wscale * t->ci->count * t->cj->count * sid_scale[t->flags]; else - cost = - 2 * wscale * t->ci->count * t->cj->count * sid_scale[t->flags]; + cost = 2 * wscale * t->ci->count * t->cj->count * sid_scale[t->flags]; break; case task_type_sub_pair: if (t->ci->nodeID != nodeID || t->cj->nodeID != nodeID) { if (t->flags < 0) cost = 3 * wscale * t->ci->count * t->cj->count; else - cost = 3 * wscale * t->ci->count * t->cj->count * - sid_scale[t->flags]; + cost = + 3 * wscale * t->ci->count * t->cj->count * sid_scale[t->flags]; } else { if (t->flags < 0) cost = 2 * wscale * t->ci->count * t->cj->count; else - cost = 2 * wscale * t->ci->count * t->cj->count * - sid_scale[t->flags]; + cost = + 2 * wscale * t->ci->count * t->cj->count * sid_scale[t->flags]; } break; case task_type_sub_self: diff --git a/src/task.h b/src/task.h index 014a6e1096..f6d75598af 100644 --- a/src/task.h +++ b/src/task.h @@ -123,7 +123,7 @@ struct task { /*! Weight of the task */ int weight; - + #if defined(WITH_MPI) && defined(HAVE_METIS) /*! Individual cost estimate for this task. */ int cost; @@ -149,7 +149,7 @@ struct task { /*! Is this task implicit (i.e. does not do anything) ? */ char implicit; - + #ifdef SWIFT_DEBUG_TASKS /*! ID of the queue or runner owning this task */ short int rid; -- GitLab