Merge branch 'master' into 3d-decomposition-2020-01

This commit is contained in:
jpekkila
2020-01-07 14:25:06 +02:00

View File

@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3")
# Require CUDA # Require CUDA
find_package(CUDA REQUIRED) find_package(CUDA REQUIRED)
set(CMAKE_CUDA_FLAGS "-gencode arch=compute_70,code=sm_70 --restrict") set(CMAKE_CUDA_FLAGS "-gencode arch=compute_60,code=sm_60 -gencode arch=compute_70,code=sm_70 --restrict")
# Compile kernels # Compile kernels
add_library(astaroth_kernels STATIC kernels/boundconds.cu kernels/integration.cu kernels/reductions.cu kernels/packing.cu) add_library(astaroth_kernels STATIC kernels/boundconds.cu kernels/integration.cu kernels/reductions.cu kernels/packing.cu)