From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 5 Dec 2019 09:32:33 +0000 (+0100)
Subject: Reindent + minor stylistic issues.
X-Git-Tag: v3.25~336^2~5
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a3c920498fb50d667fe8913fbabbfa8b60ab5c0f?hp=a88d4f2d2d1d5cce8f3cc1350f41d0dd52d55a31

Reindent + minor stylistic issues.
---

diff --git a/teshsuite/smpi/topo-cart-sub/topo-cart-sub.c b/teshsuite/smpi/topo-cart-sub/topo-cart-sub.c
index fc64b7dcbc..6521ab00e8 100644
--- a/teshsuite/smpi/topo-cart-sub/topo-cart-sub.c
+++ b/teshsuite/smpi/topo-cart-sub/topo-cart-sub.c
@@ -1,14 +1,14 @@
-/* Copyright (c) 2019. Jonathan Borne.
-*/
 /* Copyright (c) 2009-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+/* Copyright (c) 2019. Jonathan Borne.                                      */
+
+#include <mpi.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <mpi.h>
 
 #define DIM 2
 #define Q 2
@@ -17,101 +17,106 @@
 #define N 3
 /* Local matrices size N*N */
 
-int main(int argc, char **argv){
-    /* Nb of nodes in the grid:
-       initialized by MPI_Comm_size according to commandline -np value */
-    int nbNodes;
-
-    /* Communicators */
-    MPI_Comm gridComm, lineComm;
-    /* Current process ranks */
-    int rank, gridSize, myGridRank, myLineRank, myColRank;
-    /* coords: used to get myLineRank and myColRank
-       initialized by MPI_Cart_coords
-     */
-    int coords[DIM];
-    /* dims: Integer array of size ndims specifying the number
-       of processes in each dimension.
-       if init value is 0 it is reset by MPI_Dims_create.
-    */
-    int dims[DIM];
-    for(int i=0; i<DIM; i++){
-        dims[i] = Q;
-    }
-    /* periods:
-       Logical array of size ndims specifying whether the grid is
-       periodic (true) or not (false) in each dimension. */
-    int periods[DIM];
-    for(int i=0; i<DIM; i++){
-        periods[i] = 1;
-    }
-    /* reorder: do not allows rank reordering when creating the grid comm */
-    int reorder = 0;
-    /* remainDims[]: used to set which dimension is kept in subcommunicators */
-    int remainDim[DIM];
-
-    /* Local Matrix */
-    int *A = (int *)malloc(N * N * sizeof(int));
-
-    /* Init */
-    MPI_Init(&argc, &argv);
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    MPI_Comm_size(MPI_COMM_WORLD, &nbNodes);
-
-    printf("rank %d: Alive \n", rank);
-
-    MPI_Barrier(MPI_COMM_WORLD);
-
-    /* Set dims[] values to descibe a grid of nbNodes and DIM dimensions*/
-    MPI_Cart_create(MPI_COMM_WORLD, DIM, dims, periods, reorder,
-                    &gridComm);
-
-    if(gridComm == MPI_COMM_NULL) printf("error grid NULLCOMM \n");
-
-    MPI_Comm_rank(gridComm, &myGridRank);
-    MPI_Comm_size(gridComm, &gridSize);
-    MPI_Cart_coords(gridComm, myGridRank, DIM, coords);
-    myLineRank = coords[0];
-    myColRank = coords[1];
-
-    MPI_Barrier(MPI_COMM_WORLD);
-
-    /* Create a line communicator for current process */
-    remainDim[0] = 0;
-    remainDim[1] = 1;
-    MPI_Cart_sub(gridComm, remainDim , &lineComm);
-
-    /* Check if lineComm was initialized */
-    if(lineComm == MPI_COMM_NULL) printf("(%d,%d): ERR (lineComm == NULLCOMM)\n",
-                                         myLineRank, myColRank);
-
-    /* A Initialization */
-    for(int i=0; i<N; i++){
-        for(int j=0; j<N; j++){
-            *(A + (i*N) + j) = i==j?rank:0;
-        }
+int main(int argc, char** argv)
+{
+  /* Nb of nodes in the grid:
+     initialized by MPI_Comm_size according to commandline -np value */
+  int nbNodes;
+
+  /* Communicators */
+  MPI_Comm gridComm;
+  MPI_Comm lineComm;
+  /* Current process ranks */
+  int rank;
+  int gridSize;
+  int myGridRank;
+  int myLineRank;
+  int myColRank;
+  /* coords: used to get myLineRank and myColRank
+     initialized by MPI_Cart_coords
+   */
+  int coords[DIM];
+  /* dims: Integer array of size ndims specifying the number
+     of processes in each dimension.
+     if init value is 0 it is reset by MPI_Dims_create.
+  */
+  int dims[DIM];
+  for (int i = 0; i < DIM; i++) {
+    dims[i] = Q;
+  }
+  /* periods:
+     Logical array of size ndims specifying whether the grid is
+     periodic (true) or not (false) in each dimension. */
+  int periods[DIM];
+  for (int i = 0; i < DIM; i++) {
+    periods[i] = 1;
+  }
+  /* reorder: do not allows rank reordering when creating the grid comm */
+  int reorder = 0;
+  /* remainDims[]: used to set which dimension is kept in subcommunicators */
+  int remainDim[DIM];
+
+  /* Local Matrix */
+  int* A = malloc(N * N * sizeof(int));
+
+  /* Init */
+  MPI_Init(&argc, &argv);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nbNodes);
+
+  printf("rank %d: Alive \n", rank);
+
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  /* Set dims[] values to descibe a grid of nbNodes and DIM dimensions*/
+  MPI_Cart_create(MPI_COMM_WORLD, DIM, dims, periods, reorder, &gridComm);
+
+  if (gridComm == MPI_COMM_NULL)
+    printf("error grid NULLCOMM \n");
+
+  MPI_Comm_rank(gridComm, &myGridRank);
+  MPI_Comm_size(gridComm, &gridSize);
+  MPI_Cart_coords(gridComm, myGridRank, DIM, coords);
+  myLineRank = coords[0];
+  myColRank  = coords[1];
+
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  /* Create a line communicator for current process */
+  remainDim[0] = 0;
+  remainDim[1] = 1;
+  MPI_Cart_sub(gridComm, remainDim, &lineComm);
+
+  /* Check if lineComm was initialized */
+  if (lineComm == MPI_COMM_NULL)
+    printf("(%d,%d): ERR (lineComm == NULLCOMM)\n", myLineRank, myColRank);
+
+  /* A Initialization */
+  for (int i = 0; i < N; i++) {
+    for (int j = 0; j < N; j++) {
+      *(A + (i * N) + j) = i == j ? rank : 0;
     }
+  }
 
-    MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Barrier(MPI_COMM_WORLD);
 
-    /* Broadcast */
-    int root = 0;
-    MPI_Bcast(A, N*N, MPI_INT, root, lineComm);
+  /* Broadcast */
+  int root = 0;
+  MPI_Bcast(A, N * N, MPI_INT, root, lineComm);
 
-    /* Print A */
-    printf("process:(%d,%d) \n", myLineRank,
-           myColRank);
+  /* Print A */
+  printf("process:(%d,%d) \n", myLineRank, myColRank);
 
-    printf("-------------------\n");
-    for(int i=0; i<N; i++){
-        for(int j=0; j<N; j++){
-            printf("%d ", *(A + (i*N) + j));
-        }
-        printf("\n");
+  printf("-------------------\n");
+  for (int i = 0; i < N; i++) {
+    for (int j = 0; j < N; j++) {
+      printf("%d ", *(A + (i * N) + j));
     }
-    printf("-------------------\n");
-    free(A);
-    MPI_Barrier (MPI_COMM_WORLD);
-    MPI_Finalize();
-    return 0;
+    printf("\n");
+  }
+  printf("-------------------\n");
+  free(A);
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Finalize();
+  return 0;
 }