Initial build system updates for monorepo#1946
Initial build system updates for monorepo#1946alliepiper wants to merge 14 commits intoNVIDIA:mainfrom
Conversation
|
|
||
| # This must be done before any languages are enabled: | ||
| if (THRUST_TOPLEVEL_PROJECT) | ||
| cmake_minimum_required(VERSION 3.21) |
There was a problem hiding this comment.
The name ThrustCompilerHacks doesn't really make sense anymore. ThrustSetCUDAHostCompiler makes it clear what is being done.
| ${CMAKE_CUDA14_COMPILE_FEATURES} | ||
| ${CMAKE_CUDA17_COMPILE_FEATURES} | ||
| ${CMAKE_CUDA20_COMPILE_FEATURES} | ||
| set(tmp "${CMAKE_CUDA_HOST_COMPILER}") |
There was a problem hiding this comment.
We can remove this check from all projects.
There was a problem hiding this comment.
In this file, I think we should update the set(thrust_libcudacxx_version XXX) to just always be the same as the Thrust version itself.
Now that we will be synchronizing versions across components, we aren't going to try and support mix&match different versions of components.
| target_compile_options(thrust.compiler_interface INTERFACE | ||
| # If using CUDA w/ NVCC... | ||
| $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<CUDA_COMPILER_ID:NVIDIA>>:-Wno-deprecated-gpu-targets> | ||
| $<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:-diag-suppress 128> |
There was a problem hiding this comment.
Is this still needed? Add a comment if so.
There was a problem hiding this comment.
Line 13 is clobbering the CMAKE_CUDA_FLAGS argument, which prevents specifying -DCMAKE_CUDA_FLAGS="-DTHRUST_IGNORE_DEPRECATED_CPP_DIALECT -DCUB_IGNORE_DEPRECATED_CPP_DIALECT"
This allows the install rules to be generated for all projects even when the dev builds are disabled.
These are now handled at the CCCL level, using newer and more robust techniques.
21e8f32 to
d5ccade
Compare
No description provided.