Skip to content
Snippets Groups Projects
Commit a1b2f842 authored by Danny Auble's avatar Danny Auble
Browse files

BLUEGENE - fix for sending in correct geo table and only working on

correct midplanes when wiring things together.
parent ce36f32d
No related branches found
No related tags found
No related merge requests found
...@@ -501,7 +501,7 @@ extern int allocate_block(select_ba_request_t* ba_request, List results) ...@@ -501,7 +501,7 @@ extern int allocate_block(select_ba_request_t* ba_request, List results)
xfree(tmp_char); xfree(tmp_char);
if (ba_geo_test_all(ba_main_mp_bitmap, if (ba_geo_test_all(ba_main_mp_bitmap,
&success_bitmap, &success_bitmap,
ba_request->geo_table, &cnt, ba_geo_table, &cnt,
ba_main_geo_system, deny_pass, ba_main_geo_system, deny_pass,
start_loc, &scan_offset) start_loc, &scan_offset)
!= SLURM_SUCCESS) { != SLURM_SUCCESS) {
...@@ -555,7 +555,9 @@ extern int allocate_block(select_ba_request_t* ba_request, List results) ...@@ -555,7 +555,9 @@ extern int allocate_block(select_ba_request_t* ba_request, List results)
} }
itr = list_iterator_create(main_mps); itr = list_iterator_create(main_mps);
while ((ba_mp = list_next(itr))) { while ((ba_mp = list_next(itr))) {
info("here for %s", ba_mp->coord_str); if (ba_mp->used & BA_MP_USED_PASS_BIT)
continue;
info("here for %s %x", ba_mp->coord_str, ba_mp->used);
for (dim=0; dim<cluster_dims; dim++) { for (dim=0; dim<cluster_dims; dim++) {
if ((ba_geo_table->geometry[dim] == 1) if ((ba_geo_table->geometry[dim] == 1)
|| (ba_mp->coord[dim] != start_loc[dim])) || (ba_mp->coord[dim] != start_loc[dim]))
...@@ -2281,7 +2283,7 @@ static int _fill_in_wires(List mps, ba_mp_t *start_mp, int dim, ...@@ -2281,7 +2283,7 @@ static int _fill_in_wires(List mps, ba_mp_t *start_mp, int dim,
add = 1; add = 1;
curr_mp->used |= BA_MP_USED_ALTERED_PASS; curr_mp->used |= BA_MP_USED_ALTERED_PASS;
} else { } else {
error("WHAT?"); error("WHAT? %s", curr_mp->coord_str);
} }
alter_switch->usage |= BG_SWITCH_PASS; alter_switch->usage |= BG_SWITCH_PASS;
if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP) { if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment