Merge pull request #676 from caic99/develop

Test: UTs only build with related sources

Author: dyzheng

.editorconfig

@@ -10,3 +10,7 @@ trim_trailing_whitespace = true
 
 [*.yaml]
 indent_size = 2
+
+[CMakeLists.txt]
+indent_style = space
+indent_size = 2

CMakeLists.txt

@@ -42,6 +42,7 @@ find_package(MPI REQUIRED)
 include_directories(${MPI_CXX_INCLUDE_PATH})
 target_link_libraries(${ABACUS_BIN_NAME} MPI::MPI_CXX)
 add_compile_definitions(__MPI)
+list(APPEND math_libs MPI::MPI_CXX)
 
 find_package(Threads REQUIRED)
 target_link_libraries(${ABACUS_BIN_NAME} Threads::Threads)
@@ -132,48 +133,41 @@ if(ENABLE_ASAN)
     -fsanitize=address
   )
   # `add_link_options` only affects executables added after.
-  target_link_libraries(${ABACUS_BIN_NAME}
-	-fsanitize=address
-  )
+  target_link_libraries(${ABACUS_BIN_NAME} -fsanitize=address)
 endif()
 
 if(DEFINED ENV{MKLROOT} AND NOT DEFINED MKLROOT)
     set(MKLROOT "$ENV{MKLROOT}")
 endif()
 if(MKLROOT)
   find_package(IntelMKL REQUIRED)
-  add_definitions(-D__MKL -DMKL_ILP64)
+  add_definitions(-D__MKL)
   include_directories(${MKL_INCLUDE_DIRS} ${MKL_INCLUDE_DIRS}/fftw)
 
   # Since libtorch will find its own MKL, the fftw part conflicts with the original one.
   # When enable deepks, mkl will be linked within ${TORCH_LIBRARIES}.
-  if(ENABLE_DEEPKS)
-    target_link_libraries(${ABACUS_BIN_NAME}
-      -lifcore
-      # IntelMKL::MKL
-    )
-  else()
-    target_link_libraries(${ABACUS_BIN_NAME}
-      -lifcore
-      IntelMKL::MKL
-    )
+  if(NOT ENABLE_DEEPKS)
+    list(APPEND math_libs IntelMKL::MKL)
   endif()
 else()
   find_package(FFTW3 REQUIRED)
   find_package(LAPACK REQUIRED)
   find_package(ScaLAPACK REQUIRED)
   include_directories(${FFTW3_INCLUDE_DIRS})
-  target_link_libraries(${ABACUS_BIN_NAME}
+  list(APPEND math_libs
     FFTW3::FFTW3
     LAPACK::LAPACK
     ScaLAPACK::ScaLAPACK
   )
-  if(CMAKE_COMPILER_IS_GNUCXX)
-  target_link_libraries(${ABACUS_BIN_NAME}
-    -lgfortran
-  )
+  if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
+    list(APPEND math_libs -lgfortran)
+  elseif(CMAKE_CXX_COMPILER_ID MATCHES Intel)
+    list(APPEND math_libs -lifcore)
+  else()
+    message(WARNING "Cannot find the correct library for Fortran.")
   endif()
 endif()
+target_link_libraries(${ABACUS_BIN_NAME} ${math_libs})
 
 if(ENABLE_DEEPKS)
   set(CMAKE_CXX_STANDARD 14)
@@ -245,22 +239,19 @@ IF (BUILD_TESTING)
   # https://cmake.org/cmake/help/latest/module/GoogleTest.html
   add_subdirectory(tests) # Contains integration tests
 
+  function(AddTest) # function for UT
+    cmake_parse_arguments(UT "DYN" "TARGET" "LIBS;DYN_LIBS;STATIC_LIBS;SOURCES;DEPENDS" ${ARGN})
+    add_executable(${UT_TARGET} ${UT_SOURCES})
+    #dependencies & link library
+    target_link_libraries(${UT_TARGET} ${UT_LIBS}
+      OpenMP::OpenMP_CXX pthread GTest::gtest_main GTest::gmock_main)
+    install(TARGETS ${UT_TARGET} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../../tests )
+    add_test(NAME ${UT_TARGET}
+      COMMAND ${UT_TARGET}
+      WORKING_DIRECTORY $<TARGET_FILE_DIR:${UT_TARGET}>
+    )
+  endfunction(AddTest)
 endif()
-function(AddTest)
-  cmake_parse_arguments(UT "DYN" "TARGET" "LIBS;DYN_LIBS;STATIC_LIBS;SOURCES;DEPENDS" ${ARGN})
-  add_executable(${UT_TARGET} ${UT_SOURCES})
-  #dependencies & link library
-  get_target_property(ABACUS_LINK_LIBRARIES ${ABACUS_BIN_NAME} LINK_LIBRARIES)
-  target_link_libraries(${UT_TARGET} ${UT_LIBS} ${ABACUS_LINK_LIBRARIES}
-    base cell symmetry md
-    neighbor orb io ions lcao parallel mrrr pdiag pw ri driver
-    pthread GTest::gtest_main GTest::gmock_main)
-  install(TARGETS ${UT_TARGET} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../../tests )
-  add_test(NAME ${UT_TARGET}
-    COMMAND ${UT_TARGET}
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:${UT_TARGET}>
-  )
-endfunction(AddTest)
 
 add_subdirectory(source)
 

source/module_base/test/CMakeLists.txt

@@ -1,20 +1,23 @@
+remove_definitions(-D__MPI)
 AddTest(
   TARGET base_matrix3
-  SOURCES matrix3_test.cpp
+  LIBS ${math_libs}
+  SOURCES matrix3_test.cpp ../matrix3.cpp ../matrix.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory.cpp ../timer.cpp
 )
 AddTest(
   TARGET base_blas_connector
+  LIBS ${math_libs}
   SOURCES blas_connector_test.cpp
 )
 AddTest(
   TARGET base_complexarray
-  SOURCES complexarray_test.cpp
+  SOURCES complexarray_test.cpp ../complexarray.cpp
 )
 AddTest(
   TARGET tool_check
-  SOURCES tool_check_test.cpp
+  SOURCES tool_check_test.cpp ../tool_check.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory.cpp ../timer.cpp
 )
 AddTest(
   TARGET tool_quit
-  SOURCES tool_quit_test.cpp
+  SOURCES tool_quit_test.cpp ../tool_quit.cpp ../global_variable.cpp ../global_file.cpp ../memory.cpp ../timer.cpp
 )