Skip to content

removed residual uses of TA_DEFAULT_ERROR #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evaleev merged 1 commit into from
Jun 25, 2021
Merged

removed residual uses of TA_DEFAULT_ERROR #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions external/madness.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,12 @@ else()

# Setup configure variables

# Set error handling method (for TA_DEFAULT_ERROR values see top-level CMakeLists.txt)
if(TA_DEFAULT_ERROR EQUAL 0)
# Set error handling method (for TA_ASSERT_POLICY allowed values see top-level CMakeLists.txt)
if(TA_ASSERT_POLICY EQUAL TA_ASSERT_IGNORE)
set(_MAD_ASSERT_TYPE disable)
elseif(TA_DEFAULT_ERROR EQUAL 1)
elseif(TA_ASSERT_POLICY EQUAL TA_ASSERT_THROW)
set(_MAD_ASSERT_TYPE throw)
elseif(TA_DEFAULT_ERROR EQUAL 2)
set(_MAD_ASSERT_TYPE assert)
elseif(TA_DEFAULT_ERROR EQUAL 3)
elseif(TA_ASSERT_POLICY EQUAL TA_ASSERT_ABORT)
set(_MAD_ASSERT_TYPE abort)
endif()
set(MAD_ASSERT_TYPE ${_MAD_ASSERT_TYPE} CACHE INTERNAL "MADNESS assert type")
Expand Down
8 changes: 7 additions & 1 deletion external/umpire.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ else()
## use patched BLT
include(FetchBLT)

if (TA_ASSERT_POLICY EQUAL TA_ASSERT_IGNORE)
set(enable_umpire_asserts OFF)
else()
set(enable_umpire_asserts ON)
endif()

set(UMPIRE_CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_DIR}
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
Expand Down Expand Up @@ -71,7 +77,7 @@ else()
-DENABLE_TESTS=OFF
-DENABLE_EXAMPLES=OFF
-DENABLE_LOGGING=OFF
-DENABLE_ASSERTS=${TA_DEFAULT_ERROR}
-DENABLE_ASSERTS=${enable_umpire_asserts}
-DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER}
-DCMAKE_CUDA_STANDARD=${CMAKE_CUDA_STANDARD}
-DCMAKE_CUDA_EXTENSIONS=${CMAKE_CUDA_EXTENSIONS}
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ if(CUDA_FOUND)
endif()

# if tiledarray library was compiled without exceptions, use TA header-only (see below)
if (NOT TA_DEFAULT_ERROR EQUAL 1 AND NOT CUDA_FOUND AND FALSE)
if (NOT (TA_ASSERT_POLICY EQUAL TA_ASSERT_THROW) AND NOT CUDA_FOUND AND FALSE)
add_ta_executable(${executable} "${ta_test_src_files}" "MADworld;${TILEDARRAY_PRIVATE_LINK_LIBRARIES}")
target_compile_definitions(${executable} PRIVATE TILEDARRAY_HEADER_ONLY=1)
if (LAPACK_INCLUDE_DIRS)
Expand Down