refactor: move parallel_2d to module_base

root · root · commit ec32621f7136 · 2024-11-27T16:55:29.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -421,10 +421,8 @@ else()
   include_directories(${FFTW3_INCLUDE_DIRS})
   list(APPEND math_libs FFTW3::FFTW3 LAPACK::LAPACK BLAS::BLAS)
 
-  if(ENABLE_LCAO)
-    find_package(ScaLAPACK REQUIRED)
-    list(APPEND math_libs ScaLAPACK::ScaLAPACK)
-  endif()
+  find_package(ScaLAPACK REQUIRED)
+  list(APPEND math_libs ScaLAPACK::ScaLAPACK)
 
   if(USE_OPENMP)
     list(APPEND math_libs FFTW3::FFTW3_OMP)
diff --git a/source/Makefile.Objects b/source/Makefile.Objects
@@ -168,6 +168,7 @@ OBJS_BASE=abfs-vector3_order.o\
     broyden_mixing.o\
     memory_op.o\
     device.o\
+    parallel_2d.o\
 
 OBJS_CELL=atom_pseudo.o\
     atom_spec.o\
@@ -377,7 +378,6 @@ OBJS_ORBITAL=ORB_atomic.o\
       ORB_nonlocal.o\
       ORB_nonlocal_lm.o\
       ORB_read.o\
-      parallel_2d.o\
       parallel_orbitals.o\
 	  atomic_radials.o\
       hydrogen_radials.o\
diff --git a/source/module_base/CMakeLists.txt b/source/module_base/CMakeLists.txt
@@ -53,6 +53,7 @@ add_library(
     parallel_device.cpp
     spherical_bessel_transformer.cpp
     cubic_spline.cpp
+    parallel_2d.cpp
     module_mixing/mixing_data.cpp
     module_mixing/mixing.cpp
     module_mixing/plain_mixing.cpp
diff --git a/source/module_base/parallel_2d.cpp b/source/module_base/parallel_2d.cpp
diff --git a/source/module_base/parallel_2d.h b/source/module_base/parallel_2d.h
diff --git a/source/module_base/test/CMakeLists.txt b/source/module_base/test/CMakeLists.txt
@@ -241,4 +241,5 @@ if(ENABLE_GOOGLEBENCH)
   LIBS parameter 
     SOURCES perf_sphbes_test.cpp ../math_sphbes.cpp ../timer.cpp
   )
+
 endif()
diff --git a/source/module_base/test_parallel/CMakeLists.txt b/source/module_base/test_parallel/CMakeLists.txt
@@ -34,6 +34,19 @@ add_test(NAME base_parallel_reduce_test
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+AddTest(
+    TARGET parallel_2d_test
+    SOURCES parallel_2d_test.cpp ../parallel_2d.cpp
+    LIBS parameter ${math_libs} device base
+)
+
+install(FILES parallel_2d_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+find_program(BASH bash)
+add_test(NAME parallel_2d_test_para
+      COMMAND ${BASH} parallel_2d_test.sh
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 if(ENABLE_LCAO)
   # figure out the lib that provides BLACS
   if(MKLROOT)
diff --git a/source/module_base/test_parallel/parallel_2d_test.cpp b/source/module_base/test_parallel/parallel_2d_test.cpp
diff --git a/source/module_base/test_parallel/parallel_2d_test.sh b/source/module_base/test_parallel/parallel_2d_test.sh
diff --git a/source/module_basis/module_ao/CMakeLists.txt b/source/module_basis/module_ao/CMakeLists.txt
@@ -8,7 +8,6 @@ if(ENABLE_LCAO)
       ORB_nonlocal.cpp
       ORB_nonlocal_lm.cpp
       ORB_read.cpp
-      parallel_2d.cpp
       parallel_orbitals.cpp
   )
 
diff --git a/source/module_basis/module_ao/parallel_orbitals.h b/source/module_basis/module_ao/parallel_orbitals.h
@@ -1,6 +1,6 @@
 #ifndef _PARALLEL_ORBITALS_H_
 #define _PARALLEL_ORBITALS_H_
-#include "parallel_2d.h"
+#include "module_base/parallel_2d.h"
 #include <fstream>
 
 /// This class packs the information of 2D-block-cyclic for LCAO code:
diff --git a/source/module_basis/module_ao/test/CMakeLists.txt b/source/module_basis/module_ao/test/CMakeLists.txt
@@ -27,13 +27,13 @@ list(APPEND depend_files
   ../../../module_base/libm/sincos.cpp
   ../../../module_base/spherical_bessel_transformer.cpp
   ../../../module_base/cubic_spline.cpp
+  ../../../module_base/parallel_2d.cpp
   ../ORB_read.cpp
   ../ORB_atomic.cpp
   ../ORB_atomic_lm.cpp
   ../ORB_nonlocal.cpp
   ../ORB_nonlocal_lm.cpp
   ../ORB_gaunt_table.cpp
-  ../parallel_2d.cpp
   ../parallel_orbitals.cpp
   ../../../module_hamilt_lcao/hamilt_lcaodft/center2_orb-orb11.cpp
   ../../../module_hamilt_lcao/hamilt_lcaodft/center2_orb.cpp
@@ -74,23 +74,9 @@ AddTest(
     LIBS parameter ${math_libs} device base 
 )
 
-
-AddTest(
-    TARGET parallel_2d_test
-    SOURCES parallel_2d_test.cpp ../parallel_2d.cpp
-    LIBS parameter ${math_libs} device base
-)
-
-install(FILES parallel_2d_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-find_program(BASH bash)
-add_test(NAME parallel_2d_test_para
-      COMMAND ${BASH} parallel_2d_test.sh
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 AddTest(
     TARGET parallel_orbitals_test 
-    SOURCES parallel_orbitals_test.cpp ../parallel_2d.cpp ../parallel_orbitals.cpp
+    SOURCES parallel_orbitals_test.cpp ../../../module_base/parallel_2d.cpp ../parallel_orbitals.cpp
     LIBS parameter ${math_libs} device base
 )
 
diff --git a/source/module_elecstate/module_dm/test/CMakeLists.txt b/source/module_elecstate/module_dm/test/CMakeLists.txt
@@ -15,7 +15,6 @@ AddTest(
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/base_matrix.cpp
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/hcontainer.cpp
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/atom_pair.cpp
-  ${ABACUS_SOURCE_DIR}/module_basis/module_ao/parallel_2d.cpp
   ${ABACUS_SOURCE_DIR}/module_basis/module_ao/parallel_orbitals.cpp
   ${ABACUS_SOURCE_DIR}/module_io/output.cpp
 )
@@ -27,7 +26,6 @@ AddTest(
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/base_matrix.cpp
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/hcontainer.cpp
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/atom_pair.cpp
-  ${ABACUS_SOURCE_DIR}/module_basis/module_ao/parallel_2d.cpp
   ${ABACUS_SOURCE_DIR}/module_basis/module_ao/parallel_orbitals.cpp
 )
 
@@ -38,7 +36,6 @@ AddTest(
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/base_matrix.cpp
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/hcontainer.cpp
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/atom_pair.cpp
-  ${ABACUS_SOURCE_DIR}/module_basis/module_ao/parallel_2d.cpp
   ${ABACUS_SOURCE_DIR}/module_basis/module_ao/parallel_orbitals.cpp
 )
 
@@ -49,6 +46,5 @@ AddTest(
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/base_matrix.cpp
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/hcontainer.cpp
   ${ABACUS_SOURCE_DIR}/module_hamilt_lcao/module_hcontainer/atom_pair.cpp
-  ${ABACUS_SOURCE_DIR}/module_basis/module_ao/parallel_2d.cpp
   ${ABACUS_SOURCE_DIR}/module_basis/module_ao/parallel_orbitals.cpp
 )
diff --git a/source/module_hamilt_lcao/hamilt_lcaodft/operator_lcao/test/CMakeLists.txt b/source/module_hamilt_lcao/hamilt_lcaodft/operator_lcao/test/CMakeLists.txt
@@ -6,7 +6,7 @@ AddTest(
   LIBS parameter ${math_libs} psi base device container
   SOURCES test_overlapnew.cpp ../overlap_new.cpp ../../../module_hcontainer/func_folding.cpp 
   ../../../module_hcontainer/base_matrix.cpp ../../../module_hcontainer/hcontainer.cpp ../../../module_hcontainer/atom_pair.cpp  
-  ../../../../module_basis/module_ao/parallel_2d.cpp ../../../../module_basis/module_ao/parallel_orbitals.cpp 
+   ../../../../module_basis/module_ao/parallel_orbitals.cpp 
   ../../../../module_basis/module_ao/ORB_atomic_lm.cpp
   tmp_mocks.cpp ../../../../module_hamilt_general/operator.cpp
 )
@@ -16,7 +16,7 @@ AddTest(
   LIBS parameter ${math_libs} psi base device container
   SOURCES test_overlapnew_cd.cpp ../overlap_new.cpp ../../../module_hcontainer/func_folding.cpp 
   ../../../module_hcontainer/base_matrix.cpp ../../../module_hcontainer/hcontainer.cpp ../../../module_hcontainer/atom_pair.cpp  
-  ../../../../module_basis/module_ao/parallel_2d.cpp ../../../../module_basis/module_ao/parallel_orbitals.cpp 
+   ../../../../module_basis/module_ao/parallel_orbitals.cpp 
   ../../../../module_basis/module_ao/ORB_atomic_lm.cpp
   tmp_mocks.cpp ../../../../module_hamilt_general/operator.cpp
 )
@@ -26,7 +26,7 @@ AddTest(
   LIBS parameter ${math_libs} psi base device container
   SOURCES test_ekineticnew.cpp ../ekinetic_new.cpp ../../../module_hcontainer/func_folding.cpp 
   ../../../module_hcontainer/base_matrix.cpp ../../../module_hcontainer/hcontainer.cpp ../../../module_hcontainer/atom_pair.cpp  
-  ../../../../module_basis/module_ao/parallel_2d.cpp ../../../../module_basis/module_ao/parallel_orbitals.cpp 
+   ../../../../module_basis/module_ao/parallel_orbitals.cpp 
   ../../../../module_basis/module_ao/ORB_atomic_lm.cpp
   tmp_mocks.cpp ../../../../module_hamilt_general/operator.cpp
 )
@@ -36,7 +36,7 @@ AddTest(
   LIBS parameter ${math_libs} psi base device container
   SOURCES test_nonlocalnew.cpp ../nonlocal_new.cpp ../../../module_hcontainer/func_folding.cpp 
   ../../../module_hcontainer/base_matrix.cpp ../../../module_hcontainer/hcontainer.cpp ../../../module_hcontainer/atom_pair.cpp  
-  ../../../../module_basis/module_ao/parallel_2d.cpp ../../../../module_basis/module_ao/parallel_orbitals.cpp 
+  ../../../../module_basis/module_ao/parallel_orbitals.cpp 
   ../../../../module_basis/module_ao/ORB_atomic_lm.cpp
   tmp_mocks.cpp ../../../../module_hamilt_general/operator.cpp
 )
@@ -46,7 +46,7 @@ AddTest(
   LIBS parameter ${math_libs} psi base device container 
   SOURCES test_T_NL_cd.cpp ../nonlocal_new.cpp ../ekinetic_new.cpp ../../../module_hcontainer/func_folding.cpp 
   ../../../module_hcontainer/base_matrix.cpp ../../../module_hcontainer/hcontainer.cpp ../../../module_hcontainer/atom_pair.cpp  
-  ../../../../module_basis/module_ao/parallel_2d.cpp ../../../../module_basis/module_ao/parallel_orbitals.cpp 
+  ../../../../module_basis/module_ao/parallel_orbitals.cpp 
   ../../../../module_basis/module_ao/ORB_atomic_lm.cpp
   tmp_mocks.cpp ../../../../module_hamilt_general/operator.cpp
 )
@@ -56,7 +56,7 @@ AddTest(
   LIBS parameter ${math_libs} psi base device container 
   SOURCES test_dftu.cpp ../dftu_lcao.cpp ../../../module_hcontainer/func_folding.cpp 
   ../../../module_hcontainer/base_matrix.cpp ../../../module_hcontainer/hcontainer.cpp ../../../module_hcontainer/atom_pair.cpp  
-  ../../../../module_basis/module_ao/parallel_2d.cpp ../../../../module_basis/module_ao/parallel_orbitals.cpp 
+   ../../../../module_basis/module_ao/parallel_orbitals.cpp 
   ../../../../module_basis/module_ao/ORB_atomic_lm.cpp
   tmp_mocks.cpp ../../../../module_hamilt_general/operator.cpp
 )
diff --git a/source/module_hamilt_lcao/module_deltaspin/test/CMakeLists.txt b/source/module_hamilt_lcao/module_deltaspin/test/CMakeLists.txt
@@ -12,7 +12,6 @@ AddTest(
   LIBS ${math_libs} base device parameter
   SOURCES spin_constrain_test.cpp
     ../spin_constrain.cpp
-    ../../../module_basis/module_ao/parallel_2d.cpp
     ../../../module_basis/module_ao/parallel_orbitals.cpp
 )
 
diff --git a/source/module_hamilt_lcao/module_hcontainer/test/CMakeLists.txt b/source/module_hamilt_lcao/module_hcontainer/test/CMakeLists.txt
@@ -4,35 +4,35 @@ AddTest(
   TARGET hcontainer_test
   LIBS parameter ${math_libs} psi base device
   SOURCES test_hcontainer.cpp ../base_matrix.cpp ../hcontainer.cpp ../atom_pair.cpp  
-  ../../../module_basis/module_ao/parallel_2d.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
+  ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
 )
 
 AddTest(
   TARGET hcontainer_complex_test
   LIBS parameter ${math_libs} psi base device
   SOURCES test_hcontainer_complex.cpp ../base_matrix.cpp ../hcontainer.cpp ../atom_pair.cpp  
-  ../../../module_basis/module_ao/parallel_2d.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
+  ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
 )
 
 AddTest(
   TARGET hcontainer_cost_test
   LIBS parameter ${math_libs} psi base device
   SOURCES test_hcontainer_time.cpp ../base_matrix.cpp ../hcontainer.cpp ../atom_pair.cpp  
-  ../../../module_basis/module_ao/parallel_2d.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
+  ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
 )
 
 AddTest(
   TARGET hcontainer_folding_test
   LIBS parameter ${math_libs} psi base device
   SOURCES test_func_folding.cpp ../base_matrix.cpp ../hcontainer.cpp ../atom_pair.cpp  
-  ../func_folding.cpp ../../../module_basis/module_ao/parallel_2d.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
+  ../func_folding.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
 )
 
 AddTest(
   TARGET hcontainer_transfer_test
   LIBS parameter ${math_libs} psi base device
   SOURCES test_transfer.cpp ../func_transfer.cpp ../base_matrix.cpp ../hcontainer.cpp ../atom_pair.cpp  
-  ../transfer.cpp ../../../module_basis/module_ao/parallel_2d.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
+  ../transfer.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp tmp_mocks.cpp
 )
 
 install(FILES parallel_hcontainer_tests.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/source/module_hamilt_lcao/module_tddft/test/CMakeLists.txt b/source/module_hamilt_lcao/module_tddft/test/CMakeLists.txt
@@ -13,7 +13,7 @@ AddTest(
 AddTest(
   TARGET tddft_bandenergy_test
   LIBS parameter ${math_libs} base device tddft_test_lib  
-  SOURCES bandenergy_test.cpp ../bandenergy.cpp ../../../module_basis/module_ao/parallel_2d.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp
+  SOURCES bandenergy_test.cpp ../bandenergy.cpp ../../../module_basis/module_ao/parallel_orbitals.cpp
 )
 
 AddTest(
diff --git a/source/module_hsolver/parallel_k2d.h b/source/module_hsolver/parallel_k2d.h
@@ -1,7 +1,7 @@
 #ifndef PARALLEL_K2D_H
 #define PARALLEL_K2D_H
 
-#include "module_basis/module_ao/parallel_2d.h"
+#include "module_base/parallel_2d.h"
 #include "module_cell/parallel_kpoints.h"
 #include "module_hamilt_general/matrixblock.h"
 #ifdef __MPI
diff --git a/source/module_hsolver/test/CMakeLists.txt b/source/module_hsolver/test/CMakeLists.txt
@@ -100,7 +100,7 @@ if (ENABLE_MPI)
     AddTest(
       TARGET HSolver_LCAO_PEXSI
       LIBS parameter  ${math_libs} ${PEXSI_LIBRARY} ${SuperLU_DIST_LIBRARY} ${ParMETIS_LIBRARY} ${METIS_LIBRARY} MPI::MPI_CXX base psi device pexsi
-      SOURCES diago_pexsi_test.cpp ../diago_pexsi.cpp ../../module_basis/module_ao/parallel_orbitals.cpp ../../module_basis/module_ao/parallel_2d.cpp
+      SOURCES diago_pexsi_test.cpp ../diago_pexsi.cpp ../../module_basis/module_ao/parallel_orbitals.cpp
     )
     endif()
   endif()
@@ -150,7 +150,7 @@ install(FILES parallel_k2d_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 AddTest(
   TARGET hsolver_parak2d_test
   LIBS parameter  ${math_libs} base device MPI::MPI_CXX
-  SOURCES parallel_k2d_test.cpp ../parallel_k2d.cpp ../../module_cell/parallel_kpoints.cpp  ../../module_basis/module_ao/parallel_2d.cpp
+  SOURCES parallel_k2d_test.cpp ../parallel_k2d.cpp ../../module_cell/parallel_kpoints.cpp
 )
 
 find_program(BASH bash)
diff --git a/source/module_io/io_dmk.h b/source/module_io/io_dmk.h
@@ -1,7 +1,7 @@
 #ifndef DM_IO_H
 #define DM_IO_H
 
-#include "module_basis/module_ao/parallel_2d.h"
+#include "module_base/parallel_2d.h"
 #include "module_cell/unitcell.h"
 
 #include <string>
diff --git a/source/module_io/read_wfc_lcao.h b/source/module_io/read_wfc_lcao.h
@@ -10,7 +10,7 @@
 #ifdef __MPI
 // parallelization
 #include "module_base/scalapack_connector.h"
-#include "module_basis/module_ao/parallel_2d.h"
+#include "module_base/parallel_2d.h"
 #endif
 
 /**
diff --git a/source/module_io/test/CMakeLists.txt b/source/module_io/test/CMakeLists.txt
@@ -85,7 +85,7 @@ AddTest(
 AddTest(
   TARGET io_write_wfc_nao
   LIBS parameter  ${math_libs} base psi device
-  SOURCES write_wfc_nao_test.cpp ../write_wfc_nao.cpp ../../module_basis/module_ao/parallel_2d.cpp ../../module_basis/module_ao/parallel_orbitals.cpp ../binstream.cpp
+  SOURCES write_wfc_nao_test.cpp ../write_wfc_nao.cpp ../../module_basis/module_ao/parallel_orbitals.cpp ../binstream.cpp
 )
 
 install(FILES write_wfc_nao_para.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
@@ -198,7 +198,6 @@ AddTest(
   LIBS parameter  base ${math_libs} device
   SOURCES output_mulliken_test.cpp output_mulliken_mock.cpp ../output_mulliken.cpp
   ../../module_cell/cell_index.cpp
-  ../../module_basis/module_ao/parallel_2d.cpp
   ../../module_basis/module_ao/parallel_orbitals.cpp
   ../orb_io.cpp
 )
@@ -207,7 +206,7 @@ if(ENABLE_LCAO)
 AddTest(
   TARGET read_wfc_lcao_test
   LIBS parameter  base ${math_libs} device
-  SOURCES read_wfc_lcao_test.cpp ../read_wfc_lcao.cpp ../../module_basis/module_ao/parallel_2d.cpp
+  SOURCES read_wfc_lcao_test.cpp ../read_wfc_lcao.cpp
 )
 
 add_test(NAME read_wfc_lcao_test_parallel
diff --git a/source/module_io/test_serial/CMakeLists.txt b/source/module_io/test_serial/CMakeLists.txt
@@ -52,7 +52,7 @@ AddTest(
 AddTest(
   TARGET io_dmk_io
   LIBS parameter ${math_libs} base device cell_info 
-  SOURCES io_dmk_test.cpp ../io_dmk.cpp ../output.cpp ../../module_basis/module_ao/parallel_2d.cpp
+  SOURCES io_dmk_test.cpp ../io_dmk.cpp ../output.cpp
 )
 
 AddTest(
@@ -64,7 +64,7 @@ AddTest(
 AddTest(
   TARGET io_read_wfc_nao_test
   LIBS parameter ${math_libs} base device
-  SOURCES read_wfc_nao_test.cpp ../read_wfc_nao.cpp ../../module_psi/psi.cpp ../../module_basis/module_ao/parallel_orbitals.cpp ../../module_basis/module_ao/parallel_2d.cpp
+  SOURCES read_wfc_nao_test.cpp ../read_wfc_nao.cpp ../../module_psi/psi.cpp ../../module_basis/module_ao/parallel_orbitals.cpp
 )
 
 AddTest(
diff --git a/source/module_io/write_wfc_nao.cpp b/source/module_io/write_wfc_nao.cpp
@@ -4,7 +4,7 @@
 #include "module_base/memory.h"
 #include "module_base/timer.h"
 #include "module_base/tool_title.h"
-#include "module_basis/module_ao/parallel_2d.h"
+#include "module_base/parallel_2d.h"
 #include "module_base/scalapack_connector.h"
 #include "module_base/global_variable.h"
 #include "binstream.h"
diff --git a/source/module_lr/AX/AX.h b/source/module_lr/AX/AX.h
@@ -3,7 +3,7 @@
 #include "module_psi/psi.h"
 #include <vector>
 #ifdef __MPI
-#include "module_basis/module_ao/parallel_2d.h"
+#include "module_base/parallel_2d.h"
 #endif
 namespace LR
 {
diff --git a/source/module_lr/AX/test/CMakeLists.txt b/source/module_lr/AX/test/CMakeLists.txt
@@ -3,5 +3,4 @@ AddTest(
   TARGET AX_test
   LIBS parameter base ${math_libs} container device psi 
   SOURCES AX_test.cpp ../../utils/lr_util.cpp ../AX_parallel.cpp ../AX_serial.cpp
-  ../../../module_basis/module_ao/parallel_2d.cpp
 )
diff --git a/source/module_lr/dm_trans/dm_trans.h b/source/module_lr/dm_trans/dm_trans.h
@@ -4,7 +4,7 @@
 #include "module_psi/psi.h"
 #include <vector>
 #ifdef __MPI
-#include "module_basis/module_ao/parallel_2d.h"
+#include "module_base/parallel_2d.h"
 #endif
 namespace LR
 {
diff --git a/source/module_lr/dm_trans/test/CMakeLists.txt b/source/module_lr/dm_trans/test/CMakeLists.txt
@@ -3,7 +3,6 @@ AddTest(
   TARGET dm_trans_test
   LIBS parameter psi base ${math_libs} device container
   SOURCES dm_trans_test.cpp ../../utils/lr_util.cpp ../dm_trans_parallel.cpp ../dm_trans_serial.cpp
-  ../../../module_basis/module_ao/parallel_2d.cpp
   # ../../../module_base/module_container/ATen/core/tensor.cpp
   # ../../../module_base/module_container/ATen/core/tensor_shape.cpp
   # ../../../module_base/module_container/ATen/core/tensor_buffer.cpp
diff --git a/source/module_lr/utils/lr_util.h b/source/module_lr/utils/lr_util.h
diff --git a/source/module_lr/utils/test/CMakeLists.txt b/source/module_lr/utils/test/CMakeLists.txt
diff --git a/source/module_ri/module_exx_symmetry/test/CMakeLists.txt b/source/module_ri/module_exx_symmetry/test/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -241,4 +241,5 @@ if(ENABLE_GOOGLEBENCH)`
`241`	`241`	`LIBS parameter`
`242`	`242`	`SOURCES perf_sphbes_test.cpp ../math_sphbes.cpp ../timer.cpp`
`243`	`243`	`)`
	`244`	`+`
`244`	`245`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ if(ENABLE_LCAO)`
`8`	`8`	`ORB_nonlocal.cpp`
`9`	`9`	`ORB_nonlocal_lm.cpp`
`10`	`10`	`ORB_read.cpp`
`11`		`- parallel_2d.cpp`
`12`	`11`	`parallel_orbitals.cpp`
`13`	`12`	`)`
`14`	`13`