[SYCL][UR][CUDA] Fix CMake CUPTI config#17457
Merged
sommerlukas merged 2 commits intointel:syclfrom Mar 17, 2025
Merged
Conversation
Fix-up for intel#17315 which used incorrect CMake variables for CUPTI: * CUDAToolkit_cupti_INCLUDE_DIR should be CUDAToolkit_CUPTI_INCLUDE_DIR * CUDAToolkit_cupti_LIBRARY should be CUDA_cupti_LIBRARY In addition, we discovered that FindCUDAToolkit: * does not set the INCLUDE variable until CMake 3.24 * fails to find the library in CUDA toolkits installed from runfile (https://gitlab.kitware.com/cmake/cmake/-/issues/26770) Fix the variable names and retry the searches with extra paths if the header/library are not found. The REQUIRED option is enabled in the retry, which ensures that if CUPTI is not available in the system then the build fails at CMake configuration instead of later during compilation or linking.
npmiller
approved these changes
Mar 14, 2025
Seanst98
approved these changes
Mar 14, 2025
uditagarwal97
approved these changes
Mar 14, 2025
Contributor
|
@intel/llvm-gatekeepers this is ready to merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix-up for #17315 which used incorrect CMake variables for CUPTI:
CUDAToolkit_cupti_INCLUDE_DIRshould beCUDAToolkit_CUPTI_INCLUDE_DIRCUDAToolkit_cupti_LIBRARYshould beCUDA_cupti_LIBRARYIn addition, we discovered that FindCUDAToolkit:
Fix the variable names and retry the searches with extra paths if the header/library are not found. The REQUIRED option is enabled in the retry, which ensures that if CUPTI is not found then the build fails at CMake configuration instead of later during compilation or linking.