diff --git a/examples/main.c b/examples/main.c
index 97c87bdb3efbf50c2b3b5990e44b8c9d0d854393..36e1f6d8a277a153eb7bd21c1a79498267f484e2 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -529,9 +529,9 @@ int main(int argc, char *argv[]) {
if (myrank == 0) {
#if defined(HAVE_PARMETIS)
if (reparttype.usemetis)
- message("Using METIS serial partitioning:");
+ message("Using METIS serial partitioning:");
else
- message("Using ParMETIS partitioning:");
+ message("Using ParMETIS partitioning:");
#else
message("Using METIS serial partitioning:");
#endif
diff --git a/src/clocks.c b/src/clocks.c
index 4ec2cc499307d00ab5b1fd9c81fb67b9cc435dd9..c64276bf83f8b52d6d09aa4950737af2a12aa4f6 100644
--- a/src/clocks.c
+++ b/src/clocks.c
@@ -29,8 +29,8 @@
#include "../config.h"
/* Standard headers. */
-#include <stdio.h>
#include <limits.h>
+#include <stdio.h>
#include <unistd.h>
/* Local headers. */
@@ -294,10 +294,10 @@ double clocks_get_cputime_used(void) {
*/
int clocks_random_seed(void) {
#ifdef HAVE_CLOCK_GETTIME
- struct timespec timespec;
- clock_gettime(CLOCK_REALTIME, ×pec);
- return (timespec.tv_nsec % INT_MAX);
+ struct timespec timespec;
+ clock_gettime(CLOCK_REALTIME, ×pec);
+ return (timespec.tv_nsec % INT_MAX);
#else
- return (getticks() % INT_MAX);
+ return (getticks() % INT_MAX);
#endif
}
diff --git a/src/common_io.c b/src/common_io.c
index 9240146a2c122b8f33997311d84729e1c890e892..cf4f0132c4339985da21319b290aba2586e46c51 100644
--- a/src/common_io.c
+++ b/src/common_io.c
@@ -356,8 +356,7 @@ void io_write_code_description(hid_t h_file) {
#ifdef WITH_MPI
io_write_attribute_s(h_grpcode, "MPI library", mpi_version());
#ifdef HAVE_METIS
- io_write_attribute_s(h_grpcode, "METIS library version",
- metis_version());
+ io_write_attribute_s(h_grpcode, "METIS library version", metis_version());
#endif
#ifdef HAVE_PARMETIS
io_write_attribute_s(h_grpcode, "ParMETIS library version",
diff --git a/src/debug.h b/src/debug.h
index 6d0ec665355192d2569aedd36ccd59dce52a56c9..ec3807c3ba911c6a553aa42d3f8a017662217001 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -39,7 +39,7 @@ int checkCellhdxmax(const struct cell *c, int *depth);
void dumpCells(const char *prefix, int super, int active, int mpiactive,
int pactive, struct space *s, int rank, int step);
-#if defined(WITH_MPI) && (defined(HAVE_METIS) ||defined(HAVE_PARMETIS))
+#if defined(WITH_MPI) && (defined(HAVE_METIS) || defined(HAVE_PARMETIS))
#include "metis.h"
void dumpMETISGraph(const char *prefix, idx_t nvtxs, idx_t ncon, idx_t *xadj,
idx_t *adjncy, idx_t *vwgt, idx_t *vsize, idx_t *adjwgt);
diff --git a/src/partition.c b/src/partition.c
index 21ed27f7ff975dbd4843fb0d540b3e713cdeeec5..3e963e62d1e57aede040e983498c1281082cc6ae 100644
--- a/src/partition.c
+++ b/src/partition.c
@@ -60,19 +60,15 @@
/* Simple descriptions of initial partition types for reports. */
const char *initial_partition_name[] = {
- "axis aligned grids of cells",
- "vectorized point associated cells",
+ "axis aligned grids of cells", "vectorized point associated cells",
"memory balanced, using particle weighted cells",
"similar sized regions, using unweighted cells"};
/* Simple descriptions of repartition types for reports. */
const char *repartition_name[] = {
- "none",
- "edge and vertex task cost weights",
- "task cost edge weights",
+ "none", "edge and vertex task cost weights", "task cost edge weights",
"task cost vertex weights",
- "vertex task costs and edge delta timebin weights"
-};
+ "vertex task costs and edge delta timebin weights"};
/* Local functions, if needed. */
static int check_complete(struct space *s, int verbose, int nregions);
@@ -155,17 +151,17 @@ static void split_vector(struct space *s, int nregions, int *samplecells) {
}
#endif
-/* METIS/ParMETIS support (optional)
- * =================================
- *
- * METIS/ParMETIS partitions using a multi-level k-way scheme. We support
- * using this in a unweighted scheme, which works well and seems to be
- * guaranteed, and a weighted by the number of particles scheme.
- *
- * Repartitioning is based on ParMETIS and uses weights determined from the
- * estimated costs that a cells tasks will take or the relative time bins of
- * the cells next updates.
- */
+ /* METIS/ParMETIS support (optional)
+ * =================================
+ *
+ * METIS/ParMETIS partitions using a multi-level k-way scheme. We support
+ * using this in a unweighted scheme, which works well and seems to be
+ * guaranteed, and a weighted by the number of particles scheme.
+ *
+ * Repartitioning is based on ParMETIS and uses weights determined from the
+ * estimated costs that a cells tasks will take or the relative time bins of
+ * the cells next updates.
+ */
#if defined(WITH_MPI) && (defined(HAVE_METIS) || defined(HAVE_PARMETIS))
/**
@@ -625,7 +621,6 @@ static void pick_parmetis(int nodeID, struct space *s, int nregions,
if (refine)
for (int i = 0; i < nvt; i++) full_regionid[j3 + i] = celllist[j3 + i];
-
if (rank == 0) {
memcpy(xadj, &full_xadj[j1], sizeof(idx_t) * (nvt + 1));
memcpy(adjncy, &full_adjncy[j2], sizeof(idx_t) * nvt * 26);
@@ -737,19 +732,19 @@ static void pick_parmetis(int nodeID, struct space *s, int nregions,
* refinement. */
if (adaptive) {
- /* Balance between cuts and movement. */
- real_t itr_real_t = itr;
- if (ParMETIS_V3_AdaptiveRepart(vtxdist, xadj, adjncy, weights_v, NULL,
- weights_e, &wgtflag, &numflag, &ncon,
- &nparts, tpwgts, ubvec, &itr_real_t, options,
- &edgecut, regionid, &comm) != METIS_OK)
- error("Call to ParMETIS_V3_AdaptiveRepart failed.");
+ /* Balance between cuts and movement. */
+ real_t itr_real_t = itr;
+ if (ParMETIS_V3_AdaptiveRepart(
+ vtxdist, xadj, adjncy, weights_v, NULL, weights_e, &wgtflag,
+ &numflag, &ncon, &nparts, tpwgts, ubvec, &itr_real_t, options,
+ &edgecut, regionid, &comm) != METIS_OK)
+ error("Call to ParMETIS_V3_AdaptiveRepart failed.");
} else {
- if (ParMETIS_V3_RefineKway(vtxdist, xadj, adjncy, weights_v, weights_e,
- &wgtflag, &numflag, &ncon, &nparts, tpwgts,
- ubvec, options, &edgecut, regionid,
- &comm) != METIS_OK)
- error("Call to ParMETIS_V3_RefineKway failed.");
+ if (ParMETIS_V3_RefineKway(vtxdist, xadj, adjncy, weights_v, weights_e,
+ &wgtflag, &numflag, &ncon, &nparts, tpwgts,
+ ubvec, options, &edgecut, regionid,
+ &comm) != METIS_OK)
+ error("Call to ParMETIS_V3_RefineKway failed.");
}
} else {
@@ -765,8 +760,9 @@ static void pick_parmetis(int nodeID, struct space *s, int nregions,
options[2] = clocks_random_seed();
if (ParMETIS_V3_PartKway(vtxdist, xadj, adjncy, weights_v, weights_e,
- &wgtflag, &numflag, &ncon, &nparts, tpwgts, ubvec,
- options, &edgecut, regionid, &comm) != METIS_OK)
+ &wgtflag, &numflag, &ncon, &nparts, tpwgts,
+ ubvec, options, &edgecut, regionid,
+ &comm) != METIS_OK)
error("Call to ParMETIS_V3_PartKway failed.");
if (i == 0 || (best_edgecut > edgecut)) {
@@ -1072,8 +1068,8 @@ static void pick_metis(int nodeID, struct space *s, int nregions,
*/
static void repart_edge_metis(int vweights, int eweights, int timebins,
struct repartition *repartition, int nodeID,
- int nr_nodes, struct space *s,
- struct task *tasks, int nr_tasks) {
+ int nr_nodes, struct space *s, struct task *tasks,
+ int nr_tasks) {
/* Create weight arrays using task ticks for vertices and edges (edges
* assume the same graph structure as used in the part_ calls). */
@@ -1220,7 +1216,8 @@ static void repart_edge_metis(int vweights, int eweights, int timebins,
if (vweights) {
res = MPI_Allreduce(MPI_IN_PLACE, weights_v, nr_cells, MPI_DOUBLE, MPI_SUM,
MPI_COMM_WORLD);
- if (res != MPI_SUCCESS) mpi_error(res, "Failed to allreduce vertex weights.");
+ if (res != MPI_SUCCESS)
+ mpi_error(res, "Failed to allreduce vertex weights.");
}
if (eweights) {
@@ -1229,7 +1226,7 @@ static void repart_edge_metis(int vweights, int eweights, int timebins,
if (res != MPI_SUCCESS) mpi_error(res, "Failed to allreduce edge weights.");
}
- /* Allocate cell list for the partition. If not already done. */
+ /* Allocate cell list for the partition. If not already done. */
#ifdef HAVE_PARMETIS
int refine = 1;
#endif
@@ -1239,21 +1236,22 @@ static void repart_edge_metis(int vweights, int eweights, int timebins,
#endif
free(repartition->celllist);
repartition->ncelllist = 0;
- if ((repartition->celllist = (int *)malloc(sizeof(int) * nr_cells)) ==
- NULL)
+ if ((repartition->celllist = (int *)malloc(sizeof(int) * nr_cells)) == NULL)
error("Failed to allocate celllist");
repartition->ncelllist = nr_cells;
}
- /* We need to rescale the sum of the weights so that the sums of the two
- * types of weights are less than IDX_MAX, that is the range of idx_t. Also
- * we would like to balance edges and vertices when the edge weights are
- * timebins, as these have no reason to have equivalent scales, so we use an
- * equipartition. */
+ /* We need to rescale the sum of the weights so that the sums of the two
+ * types of weights are less than IDX_MAX, that is the range of idx_t. Also
+ * we would like to balance edges and vertices when the edge weights are
+ * timebins, as these have no reason to have equivalent scales, so we use an
+ * equipartition. */
double vsum = 0.0;
- if (vweights) for (int k = 0; k < nr_cells; k++) vsum += weights_v[k];
+ if (vweights)
+ for (int k = 0; k < nr_cells; k++) vsum += weights_v[k];
double esum = 0.0;
- if (eweights) for (int k = 0; k < 26 * nr_cells; k++) esum += weights_e[k];
+ if (eweights)
+ for (int k = 0; k < 26 * nr_cells; k++) esum += weights_e[k];
double vscale = 1.0;
double escale = 1.0;
@@ -1282,19 +1280,21 @@ static void repart_edge_metis(int vweights, int eweights, int timebins,
}
}
}
- if (vscale != 1.0) for (int k = 0; k < nr_cells; k++) weights_v[k] *= vscale;
+ if (vscale != 1.0)
+ for (int k = 0; k < nr_cells; k++) weights_v[k] *= vscale;
}
if (eweights) {
- if (esum > (double)IDX_MAX)
- escale = (double)(IDX_MAX - 1000) / esum;
- if (escale != 1.0) for (int k = 0; k < 26 * nr_cells; k++) weights_e[k] *= escale;
+ if (esum > (double)IDX_MAX) escale = (double)(IDX_MAX - 1000) / esum;
+ if (escale != 1.0)
+ for (int k = 0; k < 26 * nr_cells; k++) weights_e[k] *= escale;
}
- /* And repartition/ partition, using both weights or not as requested. */
+ /* And repartition/ partition, using both weights or not as requested. */
#ifdef HAVE_PARMETIS
if (repartition->usemetis) {
- pick_metis(nodeID, s, nr_nodes, weights_v, weights_e, repartition->celllist);
+ pick_metis(nodeID, s, nr_nodes, weights_v, weights_e,
+ repartition->celllist);
} else {
pick_parmetis(nodeID, s, nr_nodes, weights_v, weights_e, refine,
repartition->adaptive, repartition->itr,
@@ -1366,20 +1366,20 @@ void partition_repartition(struct repartition *reparttype, int nodeID,
ticks tic = getticks();
if (reparttype->type == REPART_METIS_VERTEX_EDGE_COSTS) {
- repart_edge_metis(1, 1, 0, reparttype, nodeID, nr_nodes, s, tasks,
- nr_tasks);
+ repart_edge_metis(1, 1, 0, reparttype, nodeID, nr_nodes, s, tasks,
+ nr_tasks);
} else if (reparttype->type == REPART_METIS_EDGE_COSTS) {
- repart_edge_metis(0, 1, 0, reparttype, nodeID, nr_nodes, s, tasks,
- nr_tasks);
+ repart_edge_metis(0, 1, 0, reparttype, nodeID, nr_nodes, s, tasks,
+ nr_tasks);
} else if (reparttype->type == REPART_METIS_VERTEX_COSTS) {
- repart_edge_metis(1, 0, 0, reparttype, nodeID, nr_nodes, s, tasks,
- nr_tasks);
+ repart_edge_metis(1, 0, 0, reparttype, nodeID, nr_nodes, s, tasks,
+ nr_tasks);
} else if (reparttype->type == REPART_METIS_VERTEX_COSTS_TIMEBINS) {
- repart_edge_metis(1, 1, 1, reparttype, nodeID, nr_nodes, s, tasks,
- nr_tasks);
+ repart_edge_metis(1, 1, 1, reparttype, nodeID, nr_nodes, s, tasks,
+ nr_tasks);
} else if (reparttype->type == REPART_NONE) {
/* Doing nothing. */
@@ -1467,8 +1467,8 @@ void partition_initial_partition(struct partition *initial_partition,
accumulate_counts(s, weights);
/* Get all the counts from all the nodes. */
- if (MPI_Allreduce(MPI_IN_PLACE, weights, s->nr_cells, MPI_DOUBLE,
- MPI_SUM, MPI_COMM_WORLD) != MPI_SUCCESS)
+ if (MPI_Allreduce(MPI_IN_PLACE, weights, s->nr_cells, MPI_DOUBLE, MPI_SUM,
+ MPI_COMM_WORLD) != MPI_SUCCESS)
error("Failed to allreduce particle cell weights.");
}
@@ -1628,8 +1628,9 @@ void partition_init(struct partition *partition,
#else
} else {
message("Invalid choice of re-partition type '%s'.", part_type);
- error("Permitted values are: 'none/none' when compiled without "
- "METIS or ParMETIS.");
+ error(
+ "Permitted values are: 'none/none' when compiled without "
+ "METIS or ParMETIS.");
#endif
}