Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Initial build system updates for monorepo #1946

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from

Conversation

alliepiper
Copy link
Collaborator

No description provided.

@alliepiper alliepiper marked this pull request as draft May 26, 2023 14:53
@alliepiper alliepiper mentioned this pull request May 26, 2023
28 tasks
@alliepiper alliepiper requested a review from robertmaynard May 26, 2023 15:01
CMakeLists.txt Outdated Show resolved Hide resolved
cmake/ThrustBuildCompilerTargets.cmake Outdated Show resolved Hide resolved
cmake/ThrustBuildCompilerTargets.cmake Outdated Show resolved Hide resolved
cmake/ThrustBuildTargetList.cmake Outdated Show resolved Hide resolved
@@ -38,6 +35,7 @@ endfunction()

# This must be done before any languages are enabled:
if (THRUST_TOPLEVEL_PROJECT)
cmake_minimum_required(VERSION 3.21)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name ThrustCompilerHacks doesn't really make sense anymore. ThrustSetCUDAHostCompiler makes it clear what is being done.

examples/CMakeLists.txt Show resolved Hide resolved
${CMAKE_CUDA14_COMPILE_FEATURES}
${CMAKE_CUDA17_COMPILE_FEATURES}
${CMAKE_CUDA20_COMPILE_FEATURES}
set(tmp "${CMAKE_CUDA_HOST_COMPILER}")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove this check from all projects.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

$<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<CUDA_COMPILER_ID:NVIDIA>>:-Wno-deprecated-gpu-targets>
$<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:-diag-suppress 128>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still needed? Add a comment if so.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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"

@alliepiper alliepiper force-pushed the monorepo_submodules branch from 21e8f32 to d5ccade Compare June 7, 2023 15:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants