refactor(parallel): rename ProcessTopology to ParallelPartition

Rename the class from ProcessTopology to ParallelPartition to avoid
the physics-specific meaning of "topology" in a condensed-matter code.
Also rename files via git mv (parallel_partition.h/cpp,
parallel_partition_test.cpp), the factory create_topology ->
create_partition, the test target MODULE_BASE_ProcessTopology ->
MODULE_BASE_ParallelPartition, and update all 7 referencing
CMakeLists.txt files. No behavior change.

Author: abacus_fixer

source/source_base/CMakeLists.txt

@@ -57,7 +57,7 @@ add_library(
     parallel_reduce.cpp
     parallel_device.cpp
     parallel_grid.cpp
-    parallel_topology.cpp
+    parallel_partition.cpp
     sph_bessel_tf.cpp
     cubic_spline.cpp
     parallel_2d.cpp

source/source_base/parallel_global.cpp

@@ -283,12 +283,12 @@ void Parallel_Global::divide_pools(const int& NPROC,
     return;
 }
 
-ProcessTopology Parallel_Global::create_topology(int world_nproc,
-                                                 int my_rank,
-                                                 int kpar,
-                                                 int bndpar,
-                                                 int diag_np,
-                                                 int /*grid_np*/)
+ParallelPartition Parallel_Global::create_partition(int world_nproc,
+                                                    int my_rank,
+                                                    int kpar,
+                                                    int bndpar,
+                                                    int diag_np,
+                                                    int /*grid_np*/)
 {
 #ifdef __MPI
     // ---- Build the nproc_in_pool vector (arithmetic, no MPI). ----
@@ -309,7 +309,7 @@ ProcessTopology Parallel_Global::create_topology(int world_nproc,
         for (int s : nproc_in_pool) { total += s; }
         if (total != world_nproc)
         {
-            ModuleBase::WARNING_QUIT("Parallel_Global::create_topology",
+            ModuleBase::WARNING_QUIT("Parallel_Global::create_partition",
                                      "internal: nproc_in_pool sum differs from world_nproc.");
         }
     }
@@ -335,7 +335,7 @@ ProcessTopology Parallel_Global::create_topology(int world_nproc,
     // These two helpers currently write DIAG_WORLD / GRID_WORLD as a
     // side effect; they were always called by drivers in the old flow
     // right after divide_pools, so we fold them into the factory to
-    // centralise all 6 legacy comm + scalar topology construction.
+    // centralise all 6 legacy comm + scalar partition construction.
     //
     // diag_np == 0 is not meaningful; fall back to 1 so the
     // even-partition guard in divide_mpi_groups (called inside
@@ -347,32 +347,32 @@ ProcessTopology Parallel_Global::create_topology(int world_nproc,
     int grank = -1, gsize = -1;
     Parallel_Global::split_grid_world(effective_diag_np, world_nproc, my_rank, grank, gsize);
 
-    return ProcessTopology(world_nproc,
-                           my_rank,
-                           kpar,
-                           my_pool_local,
-                           rank_in_pool_local,
-                           nproc_in_pool,
-                           bndpar,
-                           my_bndgroup,
-                           rank_in_bpgroup,
-                           nproc_in_bndgroup,
-                           POOL_WORLD,      // -> pw_world_comm        (legacy duped handle)
-                           KP_WORLD,        // -> kmesh_world_comm     (KP_WORLD alias back)
-                           INT_BGROUP,      // -> bsame_kdiff_world_comm
-                           BP_WORLD,        // -> bdiff_ksame_world_comm
-                           GRID_WORLD,      // -> rgrid_world_comm
-                           DIAG_WORLD,      // -> diag_world_comm
-                           MPI_COMM_NULL,   // -> matrix_world_comm (caller-filled later)
-                           MPI_COMM_NULL);  // -> atom_world_comm   (caller-filled later)
+    return ParallelPartition(world_nproc,
+                             my_rank,
+                             kpar,
+                             my_pool_local,
+                             rank_in_pool_local,
+                             nproc_in_pool,
+                             bndpar,
+                             my_bndgroup,
+                             rank_in_bpgroup,
+                             nproc_in_bndgroup,
+                             POOL_WORLD,      // -> pw_world_comm        (legacy duped handle)
+                             KP_WORLD,        // -> kmesh_world_comm     (KP_WORLD alias back)
+                             INT_BGROUP,      // -> bsame_kdiff_world_comm
+                             BP_WORLD,        // -> bdiff_ksame_world_comm
+                             GRID_WORLD,      // -> rgrid_world_comm
+                             DIAG_WORLD,      // -> diag_world_comm
+                             MPI_COMM_NULL,   // -> matrix_world_comm (caller-filled later)
+                             MPI_COMM_NULL);  // -> atom_world_comm   (caller-filled later)
 #else
-    // Serial / non-MPI fallback: a single-process trivial topology.
+    // Serial / non-MPI fallback: a single-process trivial partition.
     (void)world_nproc;
     (void)my_rank;
     (void)kpar;
     (void)bndpar;
     (void)diag_np;
-    return ProcessTopology();
+    return ParallelPartition();
 #endif
 }
 

source/source_base/parallel_global.h

@@ -7,7 +7,7 @@
 #define PARALLEL_GLOBAL_H
 
 #include "parallel_comm.h"
-#include "parallel_topology.h"
+#include "parallel_partition.h"
 
 namespace Parallel_Global
 {
@@ -21,26 +21,26 @@ extern int omp_number;
 void read_pal_param(int argc, char** argv, int& NPROC, int& NTHREAD_PER_PROC, int& MY_RANK);
 
 /**
- * @brief Build a ProcessTopology snapshot for the given parallel parameters.
+ * @brief Build a ParallelPartition snapshot for the given parallel parameters.
  *
  * This is the single factory that knows how to:
  *   * split MPI_COMM_WORLD into KPAR k-pools via divide_group_comm(even=false);
  *   * split each pool into BNDPAR band groups via divide_group_comm(even=true);
  *   * derive INT_BGROUP (bsame_kdiff_world) / BP_WORLD (bdiff_ksame_world);
  *   * split diag_np-based DIAG_WORLD and diag_np-grouped GRID_WORLD.
  *
- * The returned ProcessTopology::pw_world_comm (previously POOL_WORLD) is the
+ * The returned ParallelPartition::pw_world_comm (previously POOL_WORLD) is the
  * smallest PW tile: the intersection of one k-pool and one band-group.
  *
  * matrix_world_comm and atom_world_comm are left as MPI_COMM_NULL in the
  * returned value; callers that know which distributed view is required for
  * a given step (Parallel_2D / Parallel_Orbitals / DomainDecomposition) are
  * expected to fill them in from the appropriate view before passing the
- * topology down.
+ * partition down.
  *
  * Note: The factory is only available under __MPI. The non-MPI build path
- * uses the default ProcessTopology constructor which already produces the
- * single-process trivial topology.
+ * uses the default ParallelPartition constructor which already produces the
+ * single-process trivial partition.
  *
  * @param[in] world_nproc Size of MPI_COMM_WORLD
  * @param[in] my_rank    Rank in MPI_COMM_WORLD
@@ -52,12 +52,12 @@ void read_pal_param(int argc, char** argv, int& NPROC, int& NTHREAD_PER_PROC, in
  * @param[in] grid_np    Reserved; currently the real-space grid world is
  *                       tied to diag_np via split_grid_world(diag_np, ...).
  */
-ProcessTopology create_topology(int world_nproc,
-                                int my_rank,
-                                int kpar,
-                                int bndpar,
-                                int diag_np,
-                                int grid_np);
+ParallelPartition create_partition(int world_nproc,
+                                   int my_rank,
+                                   int kpar,
+                                   int bndpar,
+                                   int diag_np,
+                                   int grid_np);
 
 
 /**-------------------------------------------

source/source_base/parallel_topology.cpp source/source_base/parallel_partition.cppsource/source_base/parallel_topology.cpp renamed to source/source_base/parallel_partition.cpp

@@ -1,8 +1,8 @@
-#include "parallel_topology.h"
+#include "parallel_partition.h"
 
 #include <cassert>
 
-ProcessTopology::ProcessTopology()
+ParallelPartition::ParallelPartition()
     : world_nproc_(1),
       my_rank_(0),
       kpar_(1),
@@ -27,7 +27,7 @@ ProcessTopology::ProcessTopology()
 {
 }
 
-ProcessTopology::ProcessTopology(int world_nproc_in,
+ParallelPartition::ParallelPartition(int world_nproc_in,
                                  int my_rank_in,
                                  int kpar_in,
                                  int my_pool_in,
@@ -92,7 +92,7 @@ ProcessTopology::ProcessTopology(int world_nproc_in,
     assert(rank_in_band_group_ >= 0 && rank_in_band_group_ < nproc_in_band_group_);
 }
 
-int ProcessTopology::pool_root_rank(int pool) const
+int ParallelPartition::pool_root_rank(int pool) const
 {
     if (pool < 0 || pool >= kpar_)
     {
@@ -106,7 +106,7 @@ int ProcessTopology::pool_root_rank(int pool) const
     return offset;
 }
 
-int ProcessTopology::band_group_root_rank(int band_group) const
+int ParallelPartition::band_group_root_rank(int band_group) const
 {
     if (band_group < 0 || band_group >= bndpar_)
     {
@@ -135,58 +135,58 @@ int ProcessTopology::band_group_root_rank(int band_group) const
 #ifdef __MPI
 // Immutable builders: each returns a copy of *this with exactly one
 // communicator replaced. Scalar topology fields are never touched.
-ProcessTopology ProcessTopology::with_pw_world_comm(MPI_Comm comm) const
+ParallelPartition ParallelPartition::with_pw_world_comm(MPI_Comm comm) const
 {
-    ProcessTopology t = *this;
+    ParallelPartition t = *this;
     t.pw_world_comm_ = comm;
     return t;
 }
 
-ProcessTopology ProcessTopology::with_kmesh_world_comm(MPI_Comm comm) const
+ParallelPartition ParallelPartition::with_kmesh_world_comm(MPI_Comm comm) const
 {
-    ProcessTopology t = *this;
+    ParallelPartition t = *this;
     t.kmesh_world_comm_ = comm;
     return t;
 }
 
-ProcessTopology ProcessTopology::with_bsame_kdiff_world_comm(MPI_Comm comm) const
+ParallelPartition ParallelPartition::with_bsame_kdiff_world_comm(MPI_Comm comm) const
 {
-    ProcessTopology t = *this;
+    ParallelPartition t = *this;
     t.bsame_kdiff_world_comm_ = comm;
     return t;
 }
 
-ProcessTopology ProcessTopology::with_bdiff_ksame_world_comm(MPI_Comm comm) const
+ParallelPartition ParallelPartition::with_bdiff_ksame_world_comm(MPI_Comm comm) const
 {
-    ProcessTopology t = *this;
+    ParallelPartition t = *this;
     t.bdiff_ksame_world_comm_ = comm;
     return t;
 }
 
-ProcessTopology ProcessTopology::with_rgrid_world_comm(MPI_Comm comm) const
+ParallelPartition ParallelPartition::with_rgrid_world_comm(MPI_Comm comm) const
 {
-    ProcessTopology t = *this;
+    ParallelPartition t = *this;
     t.rgrid_world_comm_ = comm;
     return t;
 }
 
-ProcessTopology ProcessTopology::with_diag_world_comm(MPI_Comm comm) const
+ParallelPartition ParallelPartition::with_diag_world_comm(MPI_Comm comm) const
 {
-    ProcessTopology t = *this;
+    ParallelPartition t = *this;
     t.diag_world_comm_ = comm;
     return t;
 }
 
-ProcessTopology ProcessTopology::with_matrix_world_comm(MPI_Comm comm) const
+ParallelPartition ParallelPartition::with_matrix_world_comm(MPI_Comm comm) const
 {
-    ProcessTopology t = *this;
+    ParallelPartition t = *this;
     t.matrix_world_comm_ = comm;
     return t;
 }
 
-ProcessTopology ProcessTopology::with_atom_world_comm(MPI_Comm comm) const
+ParallelPartition ParallelPartition::with_atom_world_comm(MPI_Comm comm) const
 {
-    ProcessTopology t = *this;
+    ParallelPartition t = *this;
     t.atom_world_comm_ = comm;
     return t;
 }

source/source_base/parallel_topology.h source/source_base/parallel_partition.hsource/source_base/parallel_topology.h renamed to source/source_base/parallel_partition.h

@@ -1,5 +1,5 @@
-#ifndef PARALLEL_TOPOLOGY_H
-#define PARALLEL_TOPOLOGY_H
+#ifndef PARALLEL_PARTITION_H
+#define PARALLEL_PARTITION_H
 
 #include <vector>
 
@@ -8,7 +8,7 @@
 #endif
 
 /**
- * @brief Immutable description of the ABACUS process topology.
+ * @brief Immutable description of the ABACUS parallel partition.
  *
  * Replaces the six raw-global MPI_Comm (POOL_WORLD / KP_WORLD /
  * INT_BGROUP / BP_WORLD / GRID_WORLD / DIAG_WORLD) together with the
@@ -40,24 +40,24 @@
  * Values are captured at construction time; the object is copyable
  * (value semantics) and exposes no mutable workflow switches.
  * Consumers currently reading the global MPI_Comm / GlobalV fields
- * should migrate to taking a `const ProcessTopology&` from their
- * callers. Parallel_Global::create_topology(...) produces one such
+ * should migrate to taking a `const ParallelPartition&` from their
+ * callers. Parallel_Global::create_partition(...) produces one such
  * instance at startup whose communicators are also aliased back to
  * the legacy globals so existing code keeps working during the
  * migration.
  *
  * matrix_world_comm / atom_world_comm are not derived inside the
- * topology constructor because the correct choice depends on where
+ * partition constructor because the correct choice depends on where
  * the view is used (LCAO diag, GK diag, MD step, ...). Callers that
  * need a proper matrix or atom domain are expected to fill in the
- * handle before passing the topology down to distributed modules.
+ * handle before passing the partition down to distributed modules.
  */
-class ProcessTopology
+class ParallelPartition
 {
   public:
     /// Trivially-constructible serial fallback. Produces a single-
-    /// process, single-pool topology suitable for non-__MPI builds.
-    ProcessTopology();
+    /// process, single-pool partition suitable for non-__MPI builds.
+    ParallelPartition();
 
     /**
      * @brief Full constructor. Intended for Parallel_Global factory.
@@ -69,7 +69,7 @@ class ProcessTopology
      * and are filled in later by whichever call site knows which
      * domain view is needed for a given distributed calculation.
      */
-    ProcessTopology(int world_nproc_in,
+    ParallelPartition(int world_nproc_in,
                     int my_rank_in,
                     int kpar_in,
                     int my_pool_in,
@@ -139,14 +139,14 @@ class ProcessTopology
      * free that communicator itself). Serializers such as copies of the
      * returned object share the same handle, as usual for this class.
      */
-    ProcessTopology with_pw_world_comm(MPI_Comm comm) const;
-    ProcessTopology with_kmesh_world_comm(MPI_Comm comm) const;
-    ProcessTopology with_bsame_kdiff_world_comm(MPI_Comm comm) const;
-    ProcessTopology with_bdiff_ksame_world_comm(MPI_Comm comm) const;
-    ProcessTopology with_rgrid_world_comm(MPI_Comm comm) const;
-    ProcessTopology with_diag_world_comm(MPI_Comm comm) const;
-    ProcessTopology with_matrix_world_comm(MPI_Comm comm) const;
-    ProcessTopology with_atom_world_comm(MPI_Comm comm) const;
+    ParallelPartition with_pw_world_comm(MPI_Comm comm) const;
+    ParallelPartition with_kmesh_world_comm(MPI_Comm comm) const;
+    ParallelPartition with_bsame_kdiff_world_comm(MPI_Comm comm) const;
+    ParallelPartition with_bdiff_ksame_world_comm(MPI_Comm comm) const;
+    ParallelPartition with_rgrid_world_comm(MPI_Comm comm) const;
+    ParallelPartition with_diag_world_comm(MPI_Comm comm) const;
+    ParallelPartition with_matrix_world_comm(MPI_Comm comm) const;
+    ParallelPartition with_atom_world_comm(MPI_Comm comm) const;
 #endif
 
   private:
@@ -175,4 +175,4 @@ class ProcessTopology
 #endif
 };
 
-#endif // PARALLEL_TOPOLOGY_H
+#endif // PARALLEL_PARTITION_H

source/source_base/test_parallel/CMakeLists.txt

@@ -1,25 +1,25 @@
 AddTest(
   TARGET MODULE_BASE_ParaCommon
   LIBS parameter MPI::MPI_CXX
-  SOURCES parallel_common_test.cpp ../global_variable.cpp ../parallel_common.cpp ../parallel_reduce.cpp ../parallel_comm.cpp ../parallel_global.cpp ../parallel_topology.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp
+  SOURCES parallel_common_test.cpp ../global_variable.cpp ../parallel_common.cpp ../parallel_reduce.cpp ../parallel_comm.cpp ../parallel_global.cpp ../parallel_partition.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp
 )
 
 AddTest(
   TARGET MODULE_BASE_ParaGlobal
   LIBS parameter MPI::MPI_CXX
-  SOURCES parallel_global_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../tool_quit.cpp  ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp ../parallel_reduce.cpp ../parallel_topology.cpp
+  SOURCES parallel_global_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../tool_quit.cpp  ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp ../parallel_reduce.cpp ../parallel_partition.cpp
 )
 
 AddTest(
-  TARGET MODULE_BASE_ProcessTopology
+  TARGET MODULE_BASE_ParallelPartition
   LIBS parameter MPI::MPI_CXX
-  SOURCES parallel_topology_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp ../parallel_reduce.cpp ../parallel_topology.cpp
+  SOURCES parallel_partition_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp ../parallel_reduce.cpp ../parallel_partition.cpp
 )
 
 AddTest(
   TARGET MODULE_BASE_ParaReduce
   LIBS parameter MPI::MPI_CXX
-  SOURCES parallel_reduce_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../parallel_common.cpp ../parallel_reduce.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp ../parallel_topology.cpp
+  SOURCES parallel_reduce_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_comm.cpp ../parallel_common.cpp ../parallel_reduce.cpp ../tool_quit.cpp ../global_file.cpp ../global_function.cpp ../memory_recorder.cpp ../timer.cpp ../parallel_partition.cpp
 )
 
 install(FILES parallel_common_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})