This is an archive of the discontinued LLVM Phabricator instance.

Differential D142570

[nvptx-arch] Remove `find_package(CUDA)` as it has been deprecated.
ClosedPublic

Authored by jhuber6 on Jan 25 2023, 11:26 AM.

Details

Reviewers
tra
jdoerfert
tianshilei1992
JonChesterfield
Commits
rG759dec253695: [nvptx-arch] Remove `find_package(CUDA)` as it has been deprecated.
Summary

Since D137724 and the LLVM 17 release we have updated to CMake version
3.20. This means we can use find_package(CUDAToolkit) instead as the
legacy module is deprecated.

Diff Detail

Unit TestsFailed

TimeTest
6,460 mslibcxx CI C++2b > llvm-libc++-shared-cfg-in.libcxx/gdb::gdb_pretty_printer_test.sh.cpp
3,980 mslibcxx CI Modules > llvm-libc++-shared-cfg-in.libcxx/algorithms/specialized_algorithms/special_mem_concepts::nothrow_sentinel_for.compile.pass.cpp
4,770 mslibcxx CI Modules > llvm-libc++-shared-cfg-in.libcxx/gdb::gdb_pretty_printer_test.sh.cpp

Event Timeline

jhuber6 created this revision.Jan 25 2023, 11:26 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 25 2023, 11:26 AM
Herald added subscribers: mattd, gchakrabarti, asavonic, yaxunl. · View Herald Transcript
jhuber6 requested review of this revision.Jan 25 2023, 11:26 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 25 2023, 11:26 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
tianshilei1992 accepted this revision.Jan 25 2023, 11:30 AM

LG

This revision is now accepted and ready to land.Jan 25 2023, 11:30 AM
This revision was landed with ongoing or failed builds.Jan 25 2023, 11:58 AM
Closed by commit rG759dec253695: [nvptx-arch] Remove `find_package(CUDA)` as it has been deprecated. (authored by jhuber6). · Explain Why
This revision was automatically updated to reflect the committed changes.
jhuber6 added a commit: rG759dec253695: [nvptx-arch] Remove `find_package(CUDA)` as it has been deprecated..
Harbormaster completed remote builds in B209935: Diff 492198.Jan 25 2023, 12:32 PM

Revision Contents

PathSize
clang/
tools/
nvptx-arch/
13 lines

Diff 492198

clang/tools/nvptx-arch/CMakeLists.txt

# //===--------------------------------------------------------------------===// # //===--------------------------------------------------------------------===//
# // # //
# // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
# // See https://llvm.org/LICENSE.txt for details. # // See https://llvm.org/LICENSE.txt for details.
# // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# // # //
# //===--------------------------------------------------------------------===// # //===--------------------------------------------------------------------===//
set(LLVM_LINK_COMPONENTS Support) set(LLVM_LINK_COMPONENTS Support)
add_clang_tool(nvptx-arch NVPTXArch.cpp) add_clang_tool(nvptx-arch NVPTXArch.cpp)
# TODO: This is deprecated. Since CMake 3.17 we can use FindCUDAToolkit instead. find_package(CUDAToolkit QUIET)
find_package(CUDA QUIET)
find_library(cuda-library NAMES cuda PATHS /lib64)
if (NOT cuda-library AND CUDA_FOUND)
get_filename_component(CUDA_LIBDIR "${CUDA_cudart_static_LIBRARY}" DIRECTORY)
find_library(cuda-library NAMES cuda HINTS "${CUDA_LIBDIR}/stubs")
endif()
# If we found the CUDA library directly we just dynamically link against it. # If we found the CUDA library directly we just dynamically link against it.
if (CUDA_FOUND AND cuda-library) if (CUDAToolkit_FOUND)
target_include_directories(nvptx-arch PRIVATE ${CUDA_INCLUDE_DIRS}) target_link_libraries(nvptx-arch PRIVATE CUDA::cuda_driver)
target_link_libraries(nvptx-arch PRIVATE ${cuda-library})
else() else()
target_compile_definitions(nvptx-arch PRIVATE "DYNAMIC_CUDA") target_compile_definitions(nvptx-arch PRIVATE "DYNAMIC_CUDA")
endif() endif()