Revert sview/smap commit 58214b2a

Based upon recent experience with smap/sview, we are reverting a
change that would display each node at a separate location even if
they share a common ZXYZ coordinate.

src/plugins/select/cray/select_cray.c

@@ -781,7 +781,6 @@ extern void select_p_ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
 
 	if (select_cray_dim_size[0] == -1) {
 		node_info_t *node_ptr;
-		int nodes_per_coord = 1;
 
 		/* init the rest of the dim sizes. All current (2011)
 		 * XT/XE installations have a maximum dimension of 3,
@@ -792,9 +791,6 @@ extern void select_p_ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
 		for (i = 1; i < SYSTEM_DIMENSIONS; i++)
 			select_cray_dim_size[i] = -1;
 
-		node_ptr = &(node_info_ptr->node_array[i]);
-		if (node_ptr->arch && !strcmp(node_ptr->arch, "XE"))
-			nodes_per_coord = 4;
 		for (i = 0; i < node_info_ptr->record_count; i++) {
 			node_ptr = &(node_info_ptr->node_array[i]);
 			if (!node_ptr->node_addr ||
@@ -803,8 +799,6 @@ extern void select_p_ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
 			for (j = 0; j < SYSTEM_DIMENSIONS; j++) {
 				offset = select_char2coord(
 					node_ptr->node_addr[j]);
-				if (j == 0)
-					offset *= nodes_per_coord;
 				select_cray_dim_size[j] =
 					MAX((offset+1),
 					    select_cray_dim_size[j]);

src/smap/grid_functions.c

@@ -106,16 +106,13 @@ static int *_get_cluster_dims(node_info_msg_t *node_info_ptr)
 {
 	int *dim_size = slurmdb_setup_cluster_dim_size();
 
-	if ((params.cluster_flags & CLUSTER_FLAG_CRAYXT) && dim_size &&
-	    node_info_ptr->record_count) {
+	if ((params.cluster_flags & CLUSTER_FLAG_CRAYXT) && dim_size) {
 		static int cray_dim_size[3] = {-1, -1, -1};
 		/* For now, assume one node per coordinate all
 		 * May need to refine. */
 		cray_dim_size[0] = dim_size[0];
 		cray_dim_size[1] = dim_size[1];
 		cray_dim_size[2] = dim_size[2];
-		if (!strcmp(node_info_ptr->node_array[0].arch, "XE"))
-			cray_dim_size[0] *= 4;
 		return cray_dim_size;
 	}
 
@@ -187,16 +184,6 @@ extern void init_grid(node_info_msg_t *node_info_ptr)
 					node_info_ptr->node_array[i].
 					node_addr[len_a+j]);
 			}
-			if (node_info_ptr->node_array[i].arch &&
-			    !strcmp(node_info_ptr->node_array[i].arch, "XE")) {
-				int recs, cab, row, cage, slot, cpu;
-				recs = sscanf(node_info_ptr->node_array[i].
-					      node_hostname, "c%u-%uc%us%un%u",
-					      &cab, &row, &cage, &slot, &cpu);
-				if ((recs == 5) && (cpu >= 0))
-					node_ptr->coord[0] *= 4;
-					node_ptr->coord[0] += cpu;
-			}
 		} else {
 			len -= params.cluster_dims;
 			if (len < 0) {

src/sview/grid.c

@@ -662,17 +662,6 @@ static int _add_button_to_list(node_info_t *node_ptr,
 					node_ptr->node_addr[len_a-2]);
 				z = select_char2coord(
 					node_ptr->node_addr[len_a-1]);
-				if (node_ptr->arch &&
-				    !strcmp(node_ptr->arch, "XE")) {
-					int recs, cab, row, cage, slot, cpu;
-					recs = sscanf(node_ptr->node_hostname,
-						      "c%u-%uc%us%un%u",
-						      &cab, &row, &cage, &slot,
-						      &cpu);
-					if ((recs == 5) && (cpu >= 0)) {
-						x = x * 4 + cpu;
-					}
-				}
 			} else {
 				x = select_char2coord(node_ptr->name[len-3]);
 				y = select_char2coord(node_ptr->name[len-2]);