This is an archive of the discontinued LLVM Phabricator instance.

Differential D87195

[CMake][OpenMP] Simplify getting CUDA library directory
ClosedPublic

Authored by tambre on Sep 5 2020, 8:30 AM.

Details

Reviewers
Hahnfeld
jdoerfert
phosek
Commits
rGc42f96cb23be: [CMake][OpenMP] Simplify getting CUDA library directory
Summary

LLVM now requires CMake 3.13.4 so we can simplify this.

Diff Detail

Event Timeline

tambre created this revision.Sep 5 2020, 8:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 5 2020, 8:30 AM
Herald added subscribers: openmp-commits, guansong, yaxunl, mgorny. · View Herald Transcript
tambre requested review of this revision.Sep 5 2020, 8:30 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptSep 5 2020, 8:30 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
tambre retitled this revision from [CMake][OpenMP] Simplify getting CUDA library target to [CMake][OpenMP] Simplify getting CUDA library directory.Sep 5 2020, 8:31 AM
Harbormaster completed remote builds in B70740: Diff 290096.Sep 5 2020, 8:58 AM
tambre updated this revision to Diff 291263.Sep 11 2020, 10:18 AM

Add quotes around variable expansion.
Otherwise it might break for paths with spaces.

tambre added a reviewer: phosek.Sep 11 2020, 10:19 AM

phosek: Maybe you can review, others seems absent.

Harbormaster completed remote builds in B71399: Diff 291263.Sep 11 2020, 10:29 AM
phosek accepted this revision.Sep 11 2020, 11:01 AM

LGTM

This revision is now accepted and ready to land.Sep 11 2020, 11:01 AM
This revision was landed with ongoing or failed builds.Sep 11 2020, 11:19 AM
Closed by commit rGc42f96cb23be: [CMake][OpenMP] Simplify getting CUDA library directory (authored by tambre). · Explain Why
This revision was automatically updated to reflect the committed changes.
tambre added a commit: rGc42f96cb23be: [CMake][OpenMP] Simplify getting CUDA library directory.

Revision Contents

PathSize
openmp/
libomptarget/
cmake/
Modules/
13 lines

Diff 291287

openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake

Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Linesfind_library (
LIBOMPTARGET_DEP_CUDA_DRIVER_LIBRARIES LIBOMPTARGET_DEP_CUDA_DRIVER_LIBRARIES
NAMES NAMES
cuda cuda
PATHS PATHS
/lib64) /lib64)
# There is a libcuda.so in lib64/stubs that can be used for linking. # There is a libcuda.so in lib64/stubs that can be used for linking.
if (NOT LIBOMPTARGET_DEP_CUDA_DRIVER_LIBRARIES AND CUDA_FOUND) if (NOT LIBOMPTARGET_DEP_CUDA_DRIVER_LIBRARIES AND CUDA_FOUND)
# Since CMake 3.3 FindCUDA.cmake defaults to using static libraries. In this get_filename_component(CUDA_LIBDIR "${CUDA_cudart_static_LIBRARY}" DIRECTORY)
# case CUDA_LIBRARIES contains additional linker arguments which breaks
# get_filename_component below. Fortunately, since that change the module
# exports CUDA_cudart_static_LIBRARY which points to a single file in the
# right directory.
set(cuda_library ${CUDA_LIBRARIES})
if (DEFINED CUDA_cudart_static_LIBRARY)
set(cuda_library ${CUDA_cudart_static_LIBRARY})
endif()
get_filename_component(CUDA_LIBDIR ${cuda_library} DIRECTORY)
find_library ( find_library(
LIBOMPTARGET_DEP_CUDA_DRIVER_LIBRARIES LIBOMPTARGET_DEP_CUDA_DRIVER_LIBRARIES
NAMES NAMES
cuda cuda
HINTS HINTS
"${CUDA_LIBDIR}/stubs") "${CUDA_LIBDIR}/stubs")
endif() endif()
find_package_handle_standard_args( find_package_handle_standard_args(
▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines