Skip to content

Commit

Permalink
Merge pull request #8440 from niboshi/cmake-reorder
Browse files Browse the repository at this point in the history
Fix code grouping in `CMakeLists.txt`
  • Loading branch information
mergify[bot] committed Nov 14, 2019
2 parents 07cc7a2 + 1a01341 commit 007fff7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion chainerx_cc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ endif()
if(${CHAINERX_BUILD_CUDA})
find_package(CUDA REQUIRED QUIET)

add_definitions(-DCHAINERX_ENABLE_CUDA=1)

list(APPEND CUDA_NVCC_FLAGS "-std=c++${CMAKE_CXX_STANDARD}")

# Ignore unused function warnings in NVCC that comes from CUDA system headers.
Expand All @@ -160,7 +162,6 @@ if(${CHAINERX_BUILD_CUDA})
# CUDA_cublas_device_LIBRARY is required for CUDA > 9.2 with cmake < to 3.12.2.
# This is because cublas_device was deprecated in CUDA 9.2, but FindCUDA supported it in 3.12.2.
set(CUDA_cublas_device_LIBRARY ${CUDA_LIBRARIES})
add_definitions(-DCHAINERX_ENABLE_CUDA=1)

# If CHAINERX_CUDNN_USE_CUPY is set, retrieve cuDNN files from CuPy installation.
if(CHAINERX_CUDNN_USE_CUPY)
Expand Down

0 comments on commit 007fff7

Please sign in to comment.