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.

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

Forward-merge branch-24.06 into branch-24.08 #622

Merged
merged 1 commit into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 rapids-cmake/cuda/detail/detect_architectures.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2021, NVIDIA CORPORATION.
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -71,7 +71,7 @@ int main(int argc, char** argv) {
if(EXISTS "${eval_exe}")
execute_process(COMMAND "${eval_exe}" OUTPUT_VARIABLE __gpu_archs
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_FILE "${error_file}")
message(STATUS "Auto detection of gpu-archs: ${__gpu_archs}")
message(STATUS "Using auto detection of gpu-archs: ${__gpu_archs}")
else()
message(STATUS "Failed auto detection of gpu-archs. Falling back to using ${__gpu_archs}.")
endif()
Expand Down
14 changes: 11 additions & 3 deletions rapids-cmake/cuda/set_architectures.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,17 @@ function(rapids_cuda_set_architectures mode)
list(TRANSFORM CMAKE_CUDA_ARCHITECTURES APPEND "-real")
endif()

string(REPLACE ";" "\n " _cuda_architectures_pretty "${CMAKE_CUDA_ARCHITECTURES}")
message(STATUS "${CMAKE_PROJECT_NAME} CUDA architectures building for:\n ${_cuda_architectures_pretty}"
)
# cache the cuda archs.
get_property(cached_value GLOBAL PROPERTY rapids_cuda_architectures)
if(NOT cached_value)
set_property(GLOBAL PROPERTY rapids_cuda_architectures "${CMAKE_CUDA_ARCHITECTURES}")
endif()
if(NOT cached_value STREQUAL CMAKE_CUDA_ARCHITECTURES)
string(REPLACE ";" "\n " _cuda_architectures_pretty "${CMAKE_CUDA_ARCHITECTURES}")
message(STATUS "Project ${PROJECT_NAME} is building for CUDA architectures:\n ${_cuda_architectures_pretty}"
)
endif()

set(CMAKE_CUDA_ARCHITECTURES ${CMAKE_CUDA_ARCHITECTURES} PARENT_SCOPE)

endfunction()