Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ option(RESOLVE_USE_HIP "Use HIP language and ROCm library" OFF)
option(RESOLVE_USE_GPU "Use GPU device for computations" OFF)
mark_as_advanced(FORCE RESOLVE_USE_GPU)

option(RESOLVE_USE_ASAN "Use LLVM address sanitizer" OFF)
option(RESOLVE_USE_DOXYGEN "Use Doxygen to generate Re::Solve documentation" ON)
Comment thread
nkoukpaizan marked this conversation as resolved.
set(RESOLVE_CTEST_OUTPUT_DIR ${PROJECT_BINARY_DIR} CACHE PATH "Directory where CTest outputs are saved")

Expand Down Expand Up @@ -105,6 +106,10 @@ else()
message(STATUS "Not using HIP")
endif(RESOLVE_USE_HIP)

if (RESOLVE_USE_ASAN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
endif()
Comment thread
nkoukpaizan marked this conversation as resolved.

# The binary dir is already a global include directory
configure_file(
Expand Down
49 changes: 31 additions & 18 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"installDir": "${sourceDir}/install",
"generator": "Unix Makefiles",
"cacheVariables": {
"RESOLVE_USE_HIP": "ON",
"RESOLVE_USE_CUDA": "OFF",
"RESOLVE_USE_GPU": "ON"
"RESOLVE_USE_HIP": "ON"
}
},
{
Expand All @@ -39,16 +37,31 @@
"installDir": "${sourceDir}/install",
"generator": "Unix Makefiles"
},
{
{
"name": "ascent",
"inherits": "cuda",
"displayName": "Ascent Build",
"description": "Custom changes specific for Ascent",
"cacheVariables": {
"CMAKE_C_COMPILER": "$env{OLCF_GCC_ROOT}/bin/gcc",
"CMAKE_CXX_COMPILER": "$env{OLCF_GCC_ROOT}/bin/g++",
"CMAKE_CUDA_ARCHITECTURES": "70"
}
"CMAKE_C_COMPILER": "$env{OLCF_GCC_ROOT}/bin/gcc",
"CMAKE_CXX_COMPILER": "$env{OLCF_GCC_ROOT}/bin/g++",
"CMAKE_CUDA_ARCHITECTURES": "70"
}
},
{
"name": "ascent-clang",
"inherits": "cuda",
"displayName": "Ascent Build with Clang",
"description": "Custom changes specific for Ascent with Clang",
"cacheVariables": {
"CMAKE_C_COMPILER": "$env{OLCF_LLVM_ROOT}/bin/clang",
"CMAKE_CXX_COMPILER": "$env{OLCF_LLVM_ROOT}/bin/clang++",
"CMAKE_CUDA_COMPILER": "nvcc",
"CMAKE_CUDA_HOST_COMPILER": "$env{OLCF_LLVM_ROOT}/bin/clang++",
"CMAKE_CUDA_FLAGS": "-allow-unsupported-compiler",
"RESOLVE_USE_ASAN": "OFF",
"CMAKE_CUDA_ARCHITECTURES": "70"
}
},
{
"name": "deception",
Expand All @@ -72,16 +85,16 @@
}
},
{
"name": "crusher",
"inherits": "rocm",
"displayName": "Crusher Build",
"description": "Custom changes specific for Crusher",
"cacheVariables": {
"CMAKE_HIP_ARCHITECTURES": "gfx90a",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_C_COMPILER": "/opt/rocm-5.6.0/llvm/bin/clang",
"CMAKE_CXX_COMPILER": "/opt/rocm-5.6.0/llvm/bin/clang++"
}
"name": "crusher",
"inherits": "rocm",
"displayName": "Crusher Build",
"description": "Custom changes specific for Crusher",
"cacheVariables": {
"CMAKE_HIP_ARCHITECTURES": "gfx90a",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_C_COMPILER": "/opt/rocm-5.6.0/llvm/bin/clang",
"CMAKE_CXX_COMPILER": "/opt/rocm-5.6.0/llvm/bin/clang++"
}
}
]
}
7 changes: 7 additions & 0 deletions buildsystem/ascent-clang-env.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Load compiler...
module load llvm/12.0.0
# Load deps directly
module load cuda/11.4.2
module load cmake/3.22.2
module load suite-sparse/5.10.1
# Load spack deps
3 changes: 3 additions & 0 deletions buildsystem/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ case $MY_CLUSTER in
dl*|deception|*fat*)
export MY_CLUSTER=deception
;;
ascent-clang*)
export MY_CLUSTER=ascent-clang
;;
ascent*)
export MY_CLUSTER=ascent
;;
Expand Down