edit: rename MY_MPI_UWORD

GWmodel-Lab · Jul 14, 2024 · 05e685b · 05e685b
1 parent 6ebc89c
commit 05e685b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/gwmodelpp/utils/armampi.h b/include/gwmodelpp/utils/armampi.h
@@ -2,9 +2,9 @@
 #include "mpi.h"
 
 #ifdef ARMA_32BIT_WORD
-#define MY_MPI_UWORD MPI_UNSIGNED_LONG
+#define GWM_MPI_UWORD MPI_UNSIGNED_LONG
 #else   // ARMA_32BIT_WORD
-#define MY_MPI_UWORD MPI_UNSIGNED_LONG_LONG
+#define GWM_MPI_UWORD MPI_UNSIGNED_LONG_LONG
 #endif  // ARMA_32BIT_WORD
 
 void mat_mul_mpi(arma::mat& a, arma::mat& b, arma::mat& c, const int ip, const int np, const size_t range);
diff --git a/src/gwmodelpp/GWRBasic.cpp b/src/gwmodelpp/GWRBasic.cpp
@@ -79,7 +79,7 @@ mat GWRBasic::fit()
             aShape[3] = mWorkRangeSize;
             // cout << mWorkerId << " process send size: [" << aShape[0] << "," << aShape[1] << "," << aShape[2] << "," << aShape[3] << "]\n";
         }
-        MPI_Bcast(aShape, 4, MY_MPI_UWORD, 0, MPI_COMM_WORLD);
+        MPI_Bcast(aShape, 4, GWM_MPI_UWORD, 0, MPI_COMM_WORLD);
         if (mWorkerId > 0)                // slave process
         {
             // cout << mWorkerId << " process recv size: [" << aShape[0] << "," << aShape[1] << "," << aShape[2] << "," << aShape[3] << "]\n";

diff --git a/src/gwmodelpp/GWRMultiscale.cpp b/src/gwmodelpp/GWRMultiscale.cpp
@@ -160,7 +160,7 @@ mat GWRMultiscale::fit()
             aShape[2] = nDim;
             aShape[3] = mWorkRangeSize;
         }
-        MPI_Bcast(aShape, 4, MY_MPI_UWORD, 0, MPI_COMM_WORLD);
+        MPI_Bcast(aShape, 4, GWM_MPI_UWORD, 0, MPI_COMM_WORLD);
         if (mWorkerId > 0)                // slave process
         {
             nDp = aShape[0];
@@ -975,7 +975,7 @@ double GWRMultiscale::bandwidthSizeCriterionVarCVMpi(BandwidthWeight* bandwidthW
     {
         status = 0;
     }
-    MPI_Allgather(&status, 1, MY_MPI_UWORD, status_all.memptr(), 1, MY_MPI_UWORD, MPI_COMM_WORLD);
+    MPI_Allgather(&status, 1, GWM_MPI_UWORD, status_all.memptr(), 1, GWM_MPI_UWORD, MPI_COMM_WORLD);
     if (!all(status_all))
         return DBL_MAX;
 
@@ -1015,7 +1015,7 @@ double GWRMultiscale::bandwidthSizeCriterionVarAICMpi(BandwidthWeight* bandwidth
     {
         status = 0;
     }
-    MPI_Allgather(&status, 1, MY_MPI_UWORD, status_all.memptr(), 1, MY_MPI_UWORD, MPI_COMM_WORLD);
+    MPI_Allgather(&status, 1, GWM_MPI_UWORD, status_all.memptr(), 1, GWM_MPI_UWORD, MPI_COMM_WORLD);
     if (!all(status_all))
         return DBL_MAX;