From 0948951464db5b986de39a61b5451a825122d828 Mon Sep 17 00:00:00 2001 From: Jarno Rantaharju Date: Thu, 10 Dec 2020 14:09:19 +0200 Subject: [PATCH 1/3] Update compute capabilities --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e5f728..b8fafc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,8 @@ option( GENERATE_TESTS "Adds the compilation of a test program as a target." OFF # Configuration-dependent settings. set( CMAKE_DEBUG_POSTFIX "_d" ) -set( CUDA_NVCC_FLAGS_RELEASE ${CUDA_NVCC_FLAGS_RELEASE};-gencode arch=compute_30,code=sm_30 ) -set( CUDA_NVCC_FLAGS_DEBUG ${CUDA_NVCC_FLAGS_DEBUG};-gencode arch=compute_30,code=sm_30 ) +set( CUDA_NVCC_FLAGS_RELEASE ${CUDA_NVCC_FLAGS_RELEASE};-gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 ) +set( CUDA_NVCC_FLAGS_DEBUG ${CUDA_NVCC_FLAGS_DEBUG};-gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 ) # Unix-specific compiler flags. if ( UNIX ) From 2febe6520df7ca6cf13f2a19638ace857c309ebc Mon Sep 17 00:00:00 2001 From: Jarno Rantaharju Date: Thu, 10 Dec 2020 14:10:41 +0200 Subject: [PATCH 2/3] Add two missing headers --- src/voxelizer.cu | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/voxelizer.cu b/src/voxelizer.cu index 29898c0..aef582b 100644 --- a/src/voxelizer.cu +++ b/src/voxelizer.cu @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include #include From 7cbe82edefa5e4aabcc5ca198b2364f6f4031394 Mon Sep 17 00:00:00 2001 From: Jarno Rantaharju Date: Thu, 10 Dec 2020 14:13:50 +0200 Subject: [PATCH 3/3] Guards around the new includes --- include/common.h | 4 ---- src/voxelizer.cu | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/common.h b/include/common.h index eb1d66c..276e46f 100644 --- a/include/common.h +++ b/include/common.h @@ -5,11 +5,7 @@ #ifndef VOX_COMMON_H #define VOX_COMMON_H -#if defined(unix) || defined(__unix__) || defined(__unix) #include -#else -#include -#endif #include #include diff --git a/src/voxelizer.cu b/src/voxelizer.cu index aef582b..ccad04a 100644 --- a/src/voxelizer.cu +++ b/src/voxelizer.cu @@ -19,8 +19,10 @@ #include #include #include +#if defined(unix) || defined(__unix__) || defined(__unix) #include #include +#endif #include #include