Refactor: rearranged files in src_parallel and deleted src_parallel directory (#1922)

* Refactor: move parallel_reduce, parallel_common, parallel_global from src_parallel to module_base

* Fix: delete duplicated file

* Refactor: move parallel_grid from src_parallel to module_hamilt_pw/hamilt_pwdft/

* Refactor: move parallel_kpoints from src_parallel to module_cell, delete src_parallel

* Fix: new UT conflicts

* Fix: UT conflicts for Device_GPU

* Fix: cmake

Author: dyzheng

CMakeLists.txt

@@ -474,7 +474,6 @@ target_link_libraries(${ABACUS_BIN_NAME}
     neighbor
     io
     relax
-    parallel
     driver
     xc_
     hsolver

source/CMakeLists.txt

@@ -13,7 +13,6 @@ add_subdirectory(module_esolver)
 add_subdirectory(module_gint)
 add_subdirectory(module_io)
 add_subdirectory(module_relax)
-add_subdirectory(src_parallel)
 add_subdirectory(src_ri)
 add_subdirectory(module_ri)
 

source/Makefile

@@ -201,10 +201,6 @@ pw $(BIN_DIR)/${VERSION}-PW.x:
 $(BIN_DIR)/${VERSION}.$(suffix) : ${FP_OBJS} ${PDIAG_OBJS} ${HEADERS}
 	${CC} ${OPTS} ${OPTS_MPI} $(FP_OBJS) ${PDIAG_OBJS} ${LIBS} -o  $(BIN_DIR)/${VERSION}.$(suffix)
 
-# ${VERSION}.fp_mem.x : ${FP_OBJS} ../src_parallel/mcd.o ${HEADERS}
-# 	@ if [ ! -d $(BIN_DIR) ]; then mkdir $(BIN_DIR); fi
-# 	${CC} $(FP_OBJS) ../src_parallel/mcd.o ${LIBS} -o ${VERSION}.fp_mem.x
-# 	@ cp ${VERSION}.fp_mem.x $(BIN_DIR)/${VERSION}.fp_mem.x
 
 #==========================
 # rules

source/Makefile.Objects

@@ -50,7 +50,6 @@ VPATH=./src_global:\
 ./module_relax/relax_new:\
 ./module_hamilt_general/module_vdw:\
 ./module_io:\
-./src_parallel:\
 ./src_ri:\
 ./module_ri:\
 ./\

source/driver.cpp

@@ -65,7 +65,7 @@ void Driver::reading(void)
 
 #ifdef __MPI
     // (4)  divide the GlobalV::NPROC processors into GlobalV::KPAR for k-points parallelization.
-    GlobalC::Pkpoints.init_pools();
+    Parallel_Global::init_pools();
 #endif
 
     // (5) Read in parameters about wannier functions.

source/main.cpp

@@ -3,7 +3,7 @@
 // DATE : 2008-11-10
 //==========================================================
 #include "driver.h"
-#include "src_parallel/parallel_global.h"
+#include "module_base/parallel_global.h"
 #include <ctime>
 
 int main(int argc, char **argv)

source/module_base/CMakeLists.txt

@@ -43,6 +43,9 @@ add_library(
     tool_title.cpp
     ylm.cpp
     abfs-vector3_order.cpp
+    parallel_common.cpp
+    parallel_global.cpp
+    parallel_reduce.cpp
     ${LIBM_SRC}
 )
 

source/module_base/complexmatrix.h

@@ -6,7 +6,7 @@
 #include "matrix.h"
 
 #ifdef _MCD_CHECK
-#include "../src_parallel/mcd.h"
+#include "mcd.h"
 #endif
 namespace ModuleBase
 {

source/module_base/global_file.cpp

@@ -8,8 +8,8 @@
 #ifdef __MPI
 #include "mpi.h"
 #endif
-#include "../src_parallel/parallel_common.h"
-#include "../src_parallel/parallel_reduce.h"
+#include "module_base/parallel_common.h"
+#include "module_base/parallel_reduce.h"
 
 //----------------------------------------------------------
 // EXPLAIN : Be Called in input.cpp

source/module_base/global_function.cpp

@@ -3,7 +3,7 @@
 //==========================================================
 #include "global_function.h"
 
-#include "../src_parallel/parallel_common.h"
+#include "module_base/parallel_common.h"
 #include "global_file.h"
 
 //==========================================================