From c83936ef623abd683f936d692916b8beb13dc7f8 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 17 Dec 2004 17:28:56 +0000
Subject: [PATCH] In rotate function, change raw indecies to X, Y, and Z
#defined values. Honor jobs request to *not* rotate.
---
src/plugins/select/bluegene/bgl_job_place.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/plugins/select/bluegene/bgl_job_place.c b/src/plugins/select/bluegene/bgl_job_place.c
index c67f96d165e..b84557a1a62 100644
--- a/src/plugins/select/bluegene/bgl_job_place.c
+++ b/src/plugins/select/bluegene/bgl_job_place.c
@@ -67,22 +67,22 @@ static void _rotate_geo(uint16_t *req_geometry, int rot_cnt)
switch (rot_cnt) {
case 0: /* ABC -> ACB */
- SWAP(req_geometry[1], req_geometry[2], tmp);
+ SWAP(req_geometry[Y], req_geometry[Z], tmp);
break;
case 1: /* ACB -> CAB */
- SWAP(req_geometry[0], req_geometry[1], tmp);
+ SWAP(req_geometry[X], req_geometry[Y], tmp);
break;
case 2: /* CAB -> CBA */
- SWAP(req_geometry[1], req_geometry[2], tmp);
+ SWAP(req_geometry[Y], req_geometry[Z], tmp);
break;
case 3: /* CBA -> BCA */
- SWAP(req_geometry[0], req_geometry[1], tmp);
+ SWAP(req_geometry[X], req_geometry[Y], tmp);
break;
case 4: /* BCA -> BAC */
- SWAP(req_geometry[1], req_geometry[2], tmp);
+ SWAP(req_geometry[Y], req_geometry[Z], tmp);
break;
case 5: /* BAC -> ABC */
- SWAP(req_geometry[0], req_geometry[1], tmp);
+ SWAP(req_geometry[X], req_geometry[Y], tmp);
break;
}
}
@@ -207,6 +207,8 @@ static int _find_best_partition_match(struct job_record* job_ptr,
match = true;
break;
}
+ if (!rotate)
+ break;
_rotate_geo(req_geometry, rot_cnt);
}
--
GitLab