Skip to content

Commit 79f474e

Browse files
committed
Fix: Some testing target are exposed unconditionally
1 parent 69806fc commit 79f474e

2 files changed

Lines changed: 35 additions & 23 deletions

File tree

source/source_hsolver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ if(ENABLE_LCAO AND USE_ELPA)
8484
add_subdirectory(module_genelpa)
8585
endif()
8686

87-
IF (BUILD_TESTING)
87+
if(BUILD_TESTING)
8888
add_subdirectory(test)
8989
if(ENABLE_MPI)
9090
add_subdirectory(kernels/test)

source/source_hsolver/test/CMakeLists.txt

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ if (ENABLE_MPI)
8888
)
8989

9090
if(ENABLE_LCAO)
91-
if(USE_ELPA)
91+
if(TARGET ELPA::ELPA)
9292
AddTest(
9393
TARGET MODULE_HSOLVER_LCAO
9494
LIBS parameter ELPA::ELPA base genelpa psi device
@@ -146,30 +146,42 @@ install(FILES diago_pexsi_parallel_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DI
146146
install(FILES parallel_k2d_test.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
147147

148148

149-
if (USE_ELPA)
150-
AddTest(
151-
TARGET MODULE_HSOLVER_diago_hs_parallel
152-
LIBS parameter ELPA::ELPA base device MPI::MPI_CXX genelpa psi
153-
SOURCES test_diago_hs_para.cpp ../diag_hs_para.cpp ../diago_pxxxgvx.cpp ../diago_elpa.cpp ../diago_scalapack.cpp
154-
)
155-
else()
156-
AddTest(
149+
if(ENABLE_MPI)
150+
if(TARGET ELPA::ELPA)
151+
AddTest(
157152
TARGET MODULE_HSOLVER_diago_hs_parallel
158-
LIBS parameter base device MPI::MPI_CXX psi
159-
SOURCES test_diago_hs_para.cpp ../diag_hs_para.cpp ../diago_pxxxgvx.cpp ../diago_scalapack.cpp
153+
LIBS parameter ELPA::ELPA base device MPI::MPI_CXX genelpa psi
154+
SOURCES
155+
test_diago_hs_para.cpp
156+
../diag_hs_para.cpp
157+
../diago_pxxxgvx.cpp
158+
../diago_elpa.cpp
159+
../diago_scalapack.cpp
160160
)
161-
endif()
161+
else()
162+
AddTest(
163+
TARGET MODULE_HSOLVER_diago_hs_parallel
164+
LIBS parameter base device MPI::MPI_CXX psi
165+
SOURCES
166+
test_diago_hs_para.cpp
167+
../diag_hs_para.cpp
168+
../diago_pxxxgvx.cpp
169+
../diago_scalapack.cpp
170+
)
171+
endif()
162172

163-
AddTest(
164-
TARGET MODULE_HSOLVER_linear_trans
165-
LIBS parameter base device MPI::MPI_CXX
166-
SOURCES test_para_linear_trans.cpp ../para_linear_transform.cpp
167-
)
173+
AddTest(
174+
TARGET MODULE_HSOLVER_linear_trans
175+
LIBS parameter base device MPI::MPI_CXX
176+
SOURCES test_para_linear_trans.cpp ../para_linear_transform.cpp
177+
)
168178

169-
add_test(NAME MODULE_HSOLVER_para_linear_trans
170-
COMMAND mpirun -np 4 ./MODULE_HSOLVER_linear_trans
171-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
172-
)
179+
add_test(
180+
NAME MODULE_HSOLVER_para_linear_trans
181+
COMMAND mpirun -np 4 ./MODULE_HSOLVER_linear_trans
182+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
183+
)
184+
endif()
173185

174186
find_program(BASH bash)
175187
if (ENABLE_MPI)
@@ -197,4 +209,4 @@ if (ENABLE_MPI)
197209
)
198210
endif()
199211
endif()
200-
endif()
212+
endif()

0 commit comments

Comments
 (0)