From 72419a25acb26983bf7d963b1f6f687ca948a2b3 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 12 May 2022 10:37:47 +0200
Subject: [PATCH] Reduce scope for variables.

---
 .../colls/allreduce/allreduce-smp-rsag-rab.cpp   | 16 ++++++++--------
 src/smpi/colls/coll_tuned_topo.cpp               |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp
index 034f9f8242..d638ee00f2 100644
--- a/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp
@@ -25,7 +25,7 @@ int allreduce__smp_rsag_rab(const void *sbuf, void *rbuf, int count,
 {
   int comm_size, rank;
   int tag = COLL_TAG_ALLREDUCE;
-  int mask, src, dst;
+  int mask;
   MPI_Status status;
   if(comm->get_leaders_comm()==MPI_COMM_NULL){
     comm->init_smp();
@@ -59,7 +59,7 @@ int allreduce__smp_rsag_rab(const void *sbuf, void *rbuf, int count,
   mask = 1;
   while (mask < num_core) {
     if ((mask & intra_rank) == 0) {
-      src = (inter_rank * num_core) + (intra_rank | mask);
+      int src = (inter_rank * num_core) + (intra_rank | mask);
       //      if (src < ((inter_rank + 1) * num_core)) {
       if (src < comm_size) {
         Request::recv(tmp_buf, count, dtype, src, tag, comm, &status);
@@ -67,7 +67,7 @@ int allreduce__smp_rsag_rab(const void *sbuf, void *rbuf, int count,
       }
     } else {
 
-      dst = (inter_rank * num_core) + (intra_rank & (~mask));
+      int dst = (inter_rank * num_core) + (intra_rank & (~mask));
       Request::send(rbuf, count, dtype, dst, tag, comm);
       break;
     }
@@ -78,7 +78,7 @@ int allreduce__smp_rsag_rab(const void *sbuf, void *rbuf, int count,
   // INTER: reduce-scatter
   if (intra_rank == 0) {
 
-    int dst, base_offset, send_base_offset, recv_base_offset, recv_chunk;
+    int base_offset, send_base_offset, recv_base_offset, recv_chunk;
     int curr_count, i, recv_offset, send_offset;
 
     // reduce-scatter
@@ -90,7 +90,7 @@ int allreduce__smp_rsag_rab(const void *sbuf, void *rbuf, int count,
     base_offset = 0;
 
     while (mask < (comm_size / num_core)) {
-      dst = inter_rank ^ mask;
+      int dst = inter_rank ^ mask;
 
       // compute offsets
       // right-handside
@@ -136,7 +136,7 @@ int allreduce__smp_rsag_rab(const void *sbuf, void *rbuf, int count,
     i = 1;
     while (mask >= 1) {
       // destination pair for both send and recv
-      dst = inter_rank ^ mask;
+      int dst = inter_rank ^ mask;
 
       // compute offsets
       send_base_offset = base_offset;
@@ -171,7 +171,7 @@ int allreduce__smp_rsag_rab(const void *sbuf, void *rbuf, int count,
   mask = 1;
   while (mask < num_core_in_current_smp) {
     if (intra_rank & mask) {
-      src = (inter_rank * num_core) + (intra_rank - mask);
+      int src = (inter_rank * num_core) + (intra_rank - mask);
       Request::recv(rbuf, count, dtype, src, tag, comm, &status);
       break;
     }
@@ -181,7 +181,7 @@ int allreduce__smp_rsag_rab(const void *sbuf, void *rbuf, int count,
   mask >>= 1;
 
   while (mask > 0) {
-    dst = (inter_rank * num_core) + (intra_rank + mask);
+    int dst = (inter_rank * num_core) + (intra_rank + mask);
     if (dst < comm_size) {
       Request::send(rbuf, count, dtype, dst, tag, comm);
     }
diff --git a/src/smpi/colls/coll_tuned_topo.cpp b/src/smpi/colls/coll_tuned_topo.cpp
index 087f488be7..9e0dc01fd9 100644
--- a/src/smpi/colls/coll_tuned_topo.cpp
+++ b/src/smpi/colls/coll_tuned_topo.cpp
@@ -464,7 +464,7 @@ ompi_coll_tuned_topo_build_chain( int fanout,
 {
     int rank, size;
     int srank; /* shifted rank */
-    int i,maxchainlen;
+    int maxchainlen;
     int mark;
     ompi_coll_tree_t *chain;
 
@@ -494,7 +494,8 @@ ompi_coll_tuned_topo_build_chain( int fanout,
       fflush(stdout);
       return nullptr;
     }
-    for(i=0;i<fanout;i++) chain->tree_next[i] = -1;
+    for (int i = 0; i < fanout; i++)
+      chain->tree_next[i] = -1;
 
     /*
      * Set root & numchain
-- 
2.20.1