diff --git a/CMakeLists.txt b/CMakeLists.txt index 095afc5..93ac0ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,8 @@ IF ( (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL " MESSAGE (STATUS "cuda version: ${CUDA_VERSION}") SET(CUDA_PROPAGATE_HOST_FLAGS OFF) - SET (CUDA_NVCC_FLAGS "-arch=sm_35;-DDEBUG;-std=c++11;-D__wsu;-fmad=false") +#as35: Tesla K40c SET (CUDA_NVCC_FLAGS "-arch=sm_35;-DDEBUG;-std=c++11;-D__wsu;-fmad=false") + SET (CUDA_NVCC_FLAGS "-arch=sm_70; -gencode=arch=compute_70,code=sm_70 -DDEBUG;-std=c++11;-D__wsu;-fmad=false") SET (CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};${OPENCL_KERNELS}") IF (NOT STATIC_CUDA) diff --git a/src/CUDA/CMakeListsLibcuda.txt b/src/CUDA/CMakeListsLibcuda.txt index a94b877..16b0b8a 100644 --- a/src/CUDA/CMakeListsLibcuda.txt +++ b/src/CUDA/CMakeListsLibcuda.txt @@ -1,8 +1,9 @@ -CMAKE_MINIMUM_REQUIRED (VERSION 2.8) +CMAKE_MINIMUM_REQUIRED (VERSION 3.2) FIND_PACKAGE(CUDA REQUIRED) -SET (CUDA_NVCC_FLAGS "-arch=sm_30") +#as35: Tesla K40c SET (CUDA_NVCC_FLAGS "-arch=sm_30") +SET (CUDA_NVCC_FLAGS "-arch=sm_70") SET(LIB_TYPE STATIC) @@ -22,4 +23,4 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ) -CUDA_ADD_LIBRARY(cudadks ${DKS_CUDA_SRCS}) \ No newline at end of file +CUDA_ADD_LIBRARY(cudadks ${DKS_CUDA_SRCS}) diff --git a/src/CUDA/CudaChiSquareRuntime.cu b/src/CUDA/CudaChiSquareRuntime.cu index 6eba81d..a5cdd07 100644 --- a/src/CUDA/CudaChiSquareRuntime.cu +++ b/src/CUDA/CudaChiSquareRuntime.cu @@ -94,7 +94,8 @@ int CudaChiSquareRuntime::compileProgram(std::string function, bool mlh) { } //compile program - const char *opts[] = {"-arch=compute_35", "-fmad=false", ""}; +//as35: for Tesla K40c const char *opts[] = {"-arch=compute_35", "-fmad=false", ""}; + const char *opts[] = {"-arch=compute_70", "-fmad=false", ""}; int numopts = 2; if (mlh) { opts[2] = "-DMLH";