Skip to content

Commit a08a2f0

Browse files
committed
Enhance CDO and rename EXX_DEV -> ENABLE_EXX_DEV
1 parent 72ff6aa commit a08a2f0

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,19 @@ option(ENABLE_CNPY "Enable cnpy usage" OFF)
6969
cmake_dependent_option(ENABLE_ELPA "Enable ELPA for LCAO" ON "ENABLE_LCAO;ENABLE_MPI" OFF)
7070
cmake_dependent_option(ENABLE_LIBRI "Enable LibRI for hybrid functional"
7171
OFF "ENABLE_LCAO;ENABLE_MPI" OFF)
72-
cmake_dependent_option(EXX_DEV "Enable LibRI developing features" OFF "ENABLE_LIBRI" OFF)
72+
cmake_dependent_option(ENABLE_EXX_DEV "Enable LibRI developing features" OFF "ENABLE_LIBRI" OFF)
7373
cmake_dependent_option(ENABLE_PEXSI "Enable PEXSI for LCAO" OFF "ENABLE_LCAO;ENABLE_MPI" OFF)
7474
cmake_dependent_option(ENABLE_MLALGO "Enable the machine learning algorithms"
7575
OFF "ENABLE_LCAO;ENABLE_MPI" OFF)
7676

77+
# Two-center FFT is only used in LCAO
78+
cmake_dependent_option(ENABLE_FFT_TWO_CENTER "Enable FFT-based two-center integral method"
79+
ON "ENABLE_LCAO" OFF)
80+
81+
# Benchmark requires BUILD_TESTING
82+
cmake_dependent_option(ENABLE_GOOGLEBENCH "Enable GOOGLE-benchmark usage"
83+
OFF "BUILD_TESTING" OFF)
84+
7785
# Options requiring CUDA
7886
cmake_dependent_option(USE_CUDA_MPI "Enable CUDA-aware MPI" OFF "USE_CUDA;ENABLE_MPI" OFF)
7987
cmake_dependent_option(ENABLE_CUSOLVERMP "Enable cusolvermp" OFF "USE_CUDA" OFF)
@@ -100,6 +108,7 @@ abacus_rename_option(USE_OPENMP ENABLE_OPENMP)
100108
abacus_rename_option(USE_ABACUS_LIBM ENABLE_ABACUS_LIBM)
101109
abacus_rename_option(USE_ELPA ENABLE_ELPA)
102110
abacus_rename_option(INFO MATH_INFO)
111+
abacus_rename_option(EXX_DEV ENABLE_EXX_DEV)
103112

104113
if(DEFINED CACHE{ENABLE_LIBCOMM})
105114
message(
@@ -258,7 +267,10 @@ endif()
258267

259268
# Use DSP hardware
260269
if (USE_DSP)
261-
set(ENABLE_ELPA OFF)
270+
if(ENABLE_ELPA)
271+
message(WARNING USE_DSP is incompatible with ELPA; switching off ENABLE_ELPA)
272+
set(ENABLE_ELPA OFF)
273+
endif()
262274
set(ABACUS_BIN_NAME abacus_dsp)
263275
endif()
264276

@@ -706,7 +718,7 @@ if(ENABLE_LIBRI)
706718
find_package(cereal REQUIRED CONFIG)
707719
abacus_add_feature_definitions(__EXX EXX_DM=3 EXX_H_COMM=2 TEST_EXX_LCAO=0
708720
TEST_EXX_RADIAL=1)
709-
if(EXX_DEV)
721+
if(ENABLE_EXX_DEV)
710722
abacus_add_feature_definitions(__EXX_DEV)
711723
endif()
712724
endif()

cmake/CollectBuildInfoVars.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ if(ENABLE_LIBRI)
237237
if(ABACUS_LIBRI_VERSION STREQUAL "yes (version unknown)" AND LIBRI_DIR)
238238
set(ABACUS_LIBRI_VERSION "yes (path: ${LIBRI_DIR})")
239239
endif()
240-
if(EXX_DEV)
240+
if(ENABLE_EXX_DEV)
241241
set(ABACUS_EXX_DEV "Enabled")
242242
else()
243243
set(ABACUS_EXX_DEV "Disabled")

0 commit comments

Comments
 (0)