From 10701a2f8680199ab9837d03a7ea21798ce48fc3 Mon Sep 17 00:00:00 2001 From: Incardona Pietro <incardon@mpi-cbg.de> Date: Tue, 23 Nov 2021 11:29:21 +0100 Subject: [PATCH] Activating openmp installation test --- CMakeLists.txt | 2 +- build.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 946d47b6e..a3c683389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,7 +257,7 @@ endif() file(WRITE error_code "0") file(WRITE cuda_lib "${CUDA_cudart_static_LIBRARY} ${CUDA_cudadevrt_LIBRARY}") if(CUDA_ON_BACKEND STREQUAL "SEQUENTIAL" OR CUDA_ON_BACKEND STREQUAL "OpenMP") - file(WRITE cuda_include "-I${CUDA_INCLUDE_DIRS} -D__NVCC__ -DCUDART_VERSION=11000") + file(WRITE cuda_include "-D__NVCC__ -DCUDART_VERSION=11000") file(WRITE cuda_on_cpu "YES") else() file(WRITE cuda_include "-I${CUDA_INCLUDE_DIRS}") diff --git a/build.sh b/build.sh index c6e3ecd38..52fd80567 100755 --- a/build.sh +++ b/build.sh @@ -71,7 +71,7 @@ else fi if [ x"$with_gpu" == x"1" ]; then - gpu_support=-g + foward_options="$foward_options --with-cuda-on-backend=CUDA" else gpu_support= fi @@ -115,6 +115,8 @@ elif [ x"$comp_type" == x"garbageinjv" ]; then foward_options="$foward_options --enable-garbageinjv" elif [ x"$comp_type" == x"asan" ]; then foward_options="$foward_options --enable-asan" +elif [ x"$comp_type" == x"openmp" ]; then + foward_options="$foward_options --with-cuda-on-backend=OpenMP" fi echo "Installing with: ./install $gpu_support -i $dependency_dir $install_options -c \"$installation_dir $foward_options \" " -- GitLab