Skip to content

Commit cc956e9

Browse files
committed
Fix CUDA architecture and remove numpy message
1 parent d4f9338 commit cc956e9

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ IF(USE_CUDA)
8181
enable_language(CUDA)
8282
ADD_DEFINITIONS(-D_USE_CUDA)
8383
# Set a reasonable minimum arch
84-
if(CUDA_VERSION_MAJOR GREATER 11)
85-
set(CMAKE_CUDA_ARCHITECTURES "50" CACHE STRING "CUDA architectures to build for" FORCE)
86-
elseif(CUDA_VERSION_MAJOR GREATER 10)
87-
set(CMAKE_CUDA_ARCHITECTURES "35" CACHE STRING "CUDA architectures to build for" FORCE)
84+
if(CUDAToolkit_VERSION_MAJOR GREATER 11)
85+
set(CMAKE_CUDA_ARCHITECTURES "50" CACHE STRING "CUDA architectures to build for")
86+
elseif(CUDAToolkit_VERSION_MAJOR GREATER 10)
87+
set(CMAKE_CUDA_ARCHITECTURES "35" CACHE STRING "CUDA architectures to build for")
8888
else()
89-
set(CMAKE_CUDA_ARCHITECTURES "30" CACHE STRING "CUDA architectures to build for" FORCE)
89+
set(CMAKE_CUDA_ARCHITECTURES "30" CACHE STRING "CUDA architectures to build for")
9090
endif()
9191
message(STATUS "CUDA found. Using CUDA.")
9292
ELSE(CUDA_FOUND)

src/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ INCLUDE(FindPackageHandleStandardArgs)
6363

6464
MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
6565
if(SWIG_FOUND AND Python3_Interpreter_FOUND AND PYTHON_NUMPY_FOUND)
66-
MESSAGE("numpy found compiling python wrappers")
6766
FILE(GLOB spimage_headers "${CMAKE_CURRENT_SOURCE_DIR}/../include/spimage/*.h")
6867

6968
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/spimage_wrap.c COMMAND ${SWIG_EXECUTABLE} -python -outcurrentdir -o ${CMAKE_CURRENT_BINARY_DIR}/spimage_wrap.c ${CMAKE_CURRENT_SOURCE_DIR}/spimage_pybackend.i DEPENDS ${spimage_headers} ${CMAKE_CURRENT_SOURCE_DIR}/spimage_pybackend.i)

0 commit comments

Comments
 (0)