Fix indentation

Signed-off-by: Jake Tronge <[email protected]>

Author: jtronge

ompi/mca/coll/inter/coll_inter_scatterv.c

@@ -101,8 +101,8 @@ mca_coll_inter_scatterv_inter(const void *sbuf, ompi_count_array_t *scounts,
 	    }
 	}
 	/* perform the scatterv locally */
-    OMPI_COUNT_ARRAY_INIT(&counts_arg, counts);
-    OMPI_DISP_ARRAY_INIT(&displace_arg, displace);
+	OMPI_COUNT_ARRAY_INIT(&counts_arg, counts);
+	OMPI_DISP_ARRAY_INIT(&displace_arg, displace);
 	err = comm->c_local_comm->c_coll->coll_scatterv(ptmp, &counts_arg, &displace_arg,
 						       rdtype, rbuf, rcount,
 						       rdtype, 0, comm->c_local_comm,
@@ -122,37 +122,37 @@ mca_coll_inter_scatterv_inter(const void *sbuf, ompi_count_array_t *scounts,
 	}
 
     } else {
-    /* We must ensure that rank 0 receives a size_t array */
-    size_t *tmp_scounts_root = malloc(sizeof(size_t) * size);
-    if (NULL == tmp_scounts_root) {
-        return OMPI_ERR_OUT_OF_RESOURCE;
-    }
-    for (i = 0; i < size; ++i) {
-        tmp_scounts_root[i] = ompi_count_array_get(scounts, i);
-    }
+	/* We must ensure that rank 0 receives a size_t array */
+	size_t *tmp_scounts_root = malloc(sizeof(size_t) * size);
+	if (NULL == tmp_scounts_root) {
+	    return OMPI_ERR_OUT_OF_RESOURCE;
+	}
+	for (i = 0; i < size; ++i) {
+	    tmp_scounts_root[i] = ompi_count_array_get(scounts, i);
+	}
 	err = MCA_PML_CALL(send(tmp_scounts_root, sizeof(size_t) * size, MPI_BYTE, 0,
 				MCA_COLL_BASE_TAG_SCATTERV,
 				MCA_PML_BASE_SEND_STANDARD, comm));
-    free(tmp_scounts_root);
+	free(tmp_scounts_root);
 
 	if (OMPI_SUCCESS != err) {
 	    return err;
 	}
 
-    /* TODO:BIGCOUNT: Remove these temporaries once ompi_datatype is updated for bigcount */
-    int *tmp_scounts = malloc(sizeof(int) * size);
-    int *tmp_disps = malloc(sizeof(int) * size);
-    if (NULL == tmp_scounts || NULL == tmp_disps) {
-        return OMPI_ERR_OUT_OF_RESOURCE;
-    }
-    for (i = 0; i < size; ++i) {
-        tmp_scounts[i] = (int) ompi_count_array_get(scounts, i);
-        tmp_disps[i] = (int) ompi_disp_array_get(disps, i);
-    }
+	/* TODO:BIGCOUNT: Remove these temporaries once ompi_datatype is updated for bigcount */
+	int *tmp_scounts = malloc(sizeof(int) * size);
+	int *tmp_disps = malloc(sizeof(int) * size);
+	if (NULL == tmp_scounts || NULL == tmp_disps) {
+	    return OMPI_ERR_OUT_OF_RESOURCE;
+	}
+	for (i = 0; i < size; ++i) {
+	    tmp_scounts[i] = (int) ompi_count_array_get(scounts, i);
+	    tmp_disps[i] = (int) ompi_disp_array_get(disps, i);
+	}
 	ompi_datatype_create_indexed(size,tmp_scounts,tmp_disps,sdtype,&ndtype);
 	ompi_datatype_commit(&ndtype);
-    free(tmp_scounts);
-    free(tmp_disps);
+	free(tmp_scounts);
+	free(tmp_disps);
 
 	err = MCA_PML_CALL(send(sbuf, 1, ndtype, 0,
 				MCA_COLL_BASE_TAG_SCATTERV,

ompi/mca/coll/ucc/coll_ucc_allgatherv.c

@@ -52,7 +52,7 @@ static inline ucc_status_t mca_coll_ucc_allgatherv_init(const void *sbuf, int sc
     };
 
     if (MPI_IN_PLACE == sbuf) {
-        coll.mask  |= UCC_COLL_ARGS_FIELD_FLAGS;
+        coll.mask  = UCC_COLL_ARGS_FIELD_FLAGS;
         coll.flags |= UCC_COLL_ARGS_FLAG_IN_PLACE;
     }
     COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module);

ompi/mca/io/ompio/io_ompio.c

@@ -120,8 +120,8 @@ int ompi_io_ompio_generate_current_file_view (struct ompio_file_t *fh,
     if (mca_io_ompio_record_offset_info){
 
 	int tot_entries=0, *recvcounts=NULL, *displs=NULL;
-    ompi_count_array_t recvcounts_desc;
-    ompi_disp_array_t displs_desc;
+	ompi_count_array_t recvcounts_desc;
+	ompi_disp_array_t displs_desc;
 	mca_io_ompio_offlen_array_t *per_process=NULL;
 	mca_io_ompio_offlen_array_t  *all_process=NULL;
 	int *sorted=NULL, *column_list=NULL, *values=NULL;
@@ -251,8 +251,8 @@ int ompi_io_ompio_generate_current_file_view (struct ompio_file_t *fh,
                 }
             }
 	}
-    OMPI_COUNT_ARRAY_INIT(&recvcounts_desc, recvcounts);
-    OMPI_DISP_ARRAY_INIT(&displs_desc, displs);
+	OMPI_COUNT_ARRAY_INIT(&recvcounts_desc, recvcounts);
+	OMPI_DISP_ARRAY_INIT(&displs_desc, displs);
 	fh->f_comm->c_coll->coll_gatherv (per_process,
 					 k,
 					 io_array_type,