Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use specific CMAKE_CUDA_COMPILER instead of forcing CMake to use the same compiler for both CXX and CUDA #1710

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use specific CMAKE_CUDA_COMPILER instead of forcing CMake to use the same compiler for both CXX and CUDA #1710

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fcbdd7
separate CUDA compiler from CXX compiler
alexlnkp May 24, 2024
d94000f
Make CUDA nvcc use project CXX_STANDARD by default, instead of hardco…
alexlnkp May 24, 2024
b301b40
Merge branch 'master' into master
alexlnkp Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ if (WITH_CUDA)
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=/MT$<$<CONFIG:Debug>:d>")
endif()
endif()
list(APPEND CUDA_NVCC_FLAGS "-std=c++17")
list(APPEND CUDA_NVCC_FLAGS "-std=c++${CMAKE_CXX_STANDARD}")
if(OpenMP_CXX_FOUND)
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=${OpenMP_CXX_FLAGS}")
endif()
Expand All @@ -483,7 +483,7 @@ if (WITH_CUDA)

cuda_select_nvcc_arch_flags(ARCH_FLAGS ${CUDA_ARCH_LIST})
list(APPEND CUDA_NVCC_FLAGS ${ARCH_FLAGS})
set(CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER})
set(CUDA_HOST_COMPILER ${CMAKE_CUDA_COMPILER})

# flags for flash attention
if (WITH_FLASH_ATTN)
Expand Down
Loading