diff options
| author | Joseph Huber <huberjn@outlook.com> | 2024-06-21 10:08:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-21 10:08:05 -0500 |
| commit | 3de162fee44376b3857c73958d656f76b17e50f5 (patch) | |
| tree | 425a1b5c262cb8f35297cdf9da2f697579a32c7b | |
| parent | f581d197b7f9896f1a64922ef9928be911c96f4e (diff) | |
| download | llvm-3de162fee44376b3857c73958d656f76b17e50f5.zip llvm-3de162fee44376b3857c73958d656f76b17e50f5.tar.gz llvm-3de162fee44376b3857c73958d656f76b17e50f5.tar.bz2 | |
[Offload] Fix using old deprecated CUDA root variable (#96307)
Summary:
This variable isn't being set properly since we moved to the new way to
find the CUDA directory. That means this variable was just unset the
whole time. This patch adds it in by calculating it using the binary
directory so it can be passed to `--cuda-path`.
| -rw-r--r-- | offload/test/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | offload/test/lit.site.cfg.in | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/offload/test/CMakeLists.txt b/offload/test/CMakeLists.txt index 58cd569..3ac5d79 100644 --- a/offload/test/CMakeLists.txt +++ b/offload/test/CMakeLists.txt @@ -16,6 +16,12 @@ endif() # char into the lit command. string(REPLACE " " ";" LIBOMPTARGET_LIT_ARG_LIST "${LIBOMPTARGET_LIT_ARGS}") +find_package(CUDAToolkit QUIET) +if(CUDAToolkit_FOUND) + get_filename_component(CUDA_ROOT "${CUDAToolkit_BIN_DIR}" DIRECTORY ABSOLUTE) + get_filename_component(CUDA_LIBDIR "${CUDA_cudart_static_LIBRARY}" DIRECTORY) +endif() + string(REGEX MATCHALL "([^\ ]+\ |[^\ ]+$)" SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM_TARGETS}") foreach(CURRENT_TARGET IN LISTS SYSTEM_TARGETS) string(STRIP "${CURRENT_TARGET}" CURRENT_TARGET) @@ -29,7 +35,6 @@ foreach(CURRENT_TARGET IN LISTS SYSTEM_TARGETS) # Configure the lit.site.cfg.in file set(AUTO_GEN_COMMENT "## Autogenerated by libomptarget configuration.\n# Do not edit!") - get_filename_component(CUDA_LIBDIR "${CUDA_cudart_static_LIBRARY}" DIRECTORY) configure_file(lit.site.cfg.in ${CURRENT_TARGET}/lit.site.cfg @ONLY) endforeach() diff --git a/offload/test/lit.site.cfg.in b/offload/test/lit.site.cfg.in index 7c75aaa..4375197 100644 --- a/offload/test/lit.site.cfg.in +++ b/offload/test/lit.site.cfg.in @@ -7,7 +7,7 @@ config.test_fortran_compiler="@OPENMP_TEST_Fortran_COMPILER@" config.test_compiler_features = @OPENMP_TEST_COMPILER_FEATURES@ config.test_openmp_flags = "@OPENMP_TEST_OPENMP_FLAGS@" config.test_extra_flags = "@OPENMP_TEST_FLAGS@" -config.cuda_path = "@CUDA_TOOLKIT_ROOT_DIR@" +config.cuda_path = "@CUDA_ROOT@" config.cuda_libdir = "@CUDA_LIBDIR@" config.cuda_test_arch = "@LIBOMPTARGET_DEP_CUDA_ARCH@" config.amdgpu_test_arch = "@LIBOMPTARGET_AMDGPU_DETECTED_ARCH_LIST@" |