Skip to content

Commit 3e0555e

Browse files
authored
Fix: no function found in parallel tests (#1931)
* Fix: no function found in paralle tests * modify test names
1 parent bd71395 commit 3e0555e

File tree

10 files changed

+41
-41
lines changed

10 files changed

+41
-41
lines changed

source/module_base/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ endif()
5555

5656
if(BUILD_TESTING)
5757
add_subdirectory(test)
58+
add_subdirectory(test_parallel)
5859
add_subdirectory(kernels/test)
5960
if (USE_ABACUS_LIBM)
6061
add_subdirectory(libm/test)

source/module_base/test/CMakeLists.txt

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,3 @@
1-
AddTest(
2-
TARGET ParaCommon
3-
LIBS MPI::MPI_CXX
4-
SOURCES parallel_common_test.cpp ../global_variable.cpp ../parallel_common.cpp
5-
)
6-
7-
AddTest(
8-
TARGET ParaGlobal
9-
LIBS MPI::MPI_CXX
10-
SOURCES parallel_global_test.cpp ../global_variable.cpp ../parallel_global.cpp
11-
)
12-
13-
AddTest(
14-
TARGET ParaReduce
15-
LIBS MPI::MPI_CXX
16-
SOURCES parallel_reduce_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_common.cpp ../parallel_reduce.cpp
17-
)
18-
19-
install(FILES parallel_common_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
20-
install(FILES parallel_global_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
21-
install(FILES parallel_reduce_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
22-
23-
add_test(NAME parallel_common_test
24-
COMMAND ${BASH} parallel_common_test.sh
25-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
26-
)
27-
add_test(NAME parallel_global_test
28-
COMMAND ${BASH} parallel_global_test.sh
29-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
30-
)
31-
add_test(NAME parallel_reduce_test
32-
COMMAND ${BASH} parallel_reduce_test.sh
33-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
34-
)
35-
361
remove_definitions(-D__MPI)
372
AddTest(
383
TARGET base_blas_connector
@@ -103,7 +68,7 @@ AddTest(
10368
TARGET base_ylmreal
10469
LIBS ${math_libs} device
10570
SOURCES math_ylmreal_test.cpp ../math_ylmreal.cpp ../complexmatrix.cpp ../global_variable.cpp ../ylm.cpp ../realarray.cpp ../timer.cpp ../matrix.cpp ../vector3.h
106-
../../module_base/parallel_reduce.cpp ../../module_base/parallel_global.cpp ../../module_base/parallel_common.cpp
71+
../parallel_reduce.cpp ../parallel_global.cpp ../parallel_common.cpp
10772
../memory.cpp
10873
)
10974
AddTest(
@@ -156,12 +121,12 @@ AddTest(
156121

157122
AddTest(
158123
TARGET base_opt_CG
159-
SOURCES opt_CG_test.cpp opt_test_tools.cpp ../opt_CG.cpp ../opt_DCsrch.cpp ../global_variable.cpp ../../module_base/parallel_reduce.cpp
124+
SOURCES opt_CG_test.cpp opt_test_tools.cpp ../opt_CG.cpp ../opt_DCsrch.cpp ../global_variable.cpp ../parallel_reduce.cpp
160125
)
161126

162127
AddTest(
163128
TARGET base_opt_TN
164-
SOURCES opt_TN_test.cpp opt_test_tools.cpp ../opt_CG.cpp ../opt_DCsrch.cpp ../global_variable.cpp ../../module_base/parallel_reduce.cpp
129+
SOURCES opt_TN_test.cpp opt_test_tools.cpp ../opt_CG.cpp ../opt_DCsrch.cpp ../global_variable.cpp ../parallel_reduce.cpp
165130
)
166131

167132
AddTest(
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
AddTest(
2+
TARGET base_ParaCommon
3+
LIBS MPI::MPI_CXX
4+
SOURCES parallel_common_test.cpp ../global_variable.cpp ../parallel_common.cpp
5+
)
6+
7+
AddTest(
8+
TARGET base_ParaGlobal
9+
LIBS MPI::MPI_CXX
10+
SOURCES parallel_global_test.cpp ../global_variable.cpp ../parallel_global.cpp
11+
)
12+
13+
AddTest(
14+
TARGET base_ParaReduce
15+
LIBS MPI::MPI_CXX
16+
SOURCES parallel_reduce_test.cpp ../global_variable.cpp ../parallel_global.cpp ../parallel_common.cpp ../parallel_reduce.cpp
17+
)
18+
19+
install(FILES parallel_common_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
20+
install(FILES parallel_global_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
21+
install(FILES parallel_reduce_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
22+
23+
add_test(NAME base_parallel_common_test
24+
COMMAND ${BASH} parallel_common_test.sh
25+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
26+
)
27+
add_test(NAME base_parallel_global_test
28+
COMMAND ${BASH} parallel_global_test.sh
29+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
30+
)
31+
add_test(NAME base_parallel_reduce_test
32+
COMMAND ${BASH} parallel_reduce_test.sh
33+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
34+
)

source/module_cell/test/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ AddTest(
3030
)
3131

3232
AddTest(
33-
TARGET klist_test
33+
TARGET cell_klist_test
3434
LIBS ${math_libs} base device
3535
SOURCES klist_test.cpp ../klist.cpp
3636
../parallel_kpoints.cpp
@@ -39,7 +39,7 @@ AddTest(
3939
)
4040

4141
AddTest(
42-
TARGET ParaKpoints
42+
TARGET cell_ParaKpoints
4343
LIBS MPI::MPI_CXX
4444
SOURCES parallel_kpoints_test.cpp ../../module_base/global_variable.cpp ../../module_base/parallel_global.cpp ../../module_base/parallel_common.cpp ../parallel_kpoints.cpp
4545
)
@@ -59,7 +59,7 @@ add_test(NAME cell_bcast_atom_spec_test
5959
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
6060
)
6161

62-
add_test(NAME parallel_kpoints_test
62+
add_test(NAME cell_parallel_kpoints_test
6363
COMMAND ${BASH} parallel_kpoints_test.sh
6464
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
6565
)

0 commit comments

Comments
 (0)