[CMake] Use llvm-config to locate Findzstd.cmake #16032
Merged
Conversation
This file contains 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
LLVM17 now depends on `-lzstd` when the `--link-static` option is used. I.e: ``` $ llvm-config-16 --link-static --system-libs -lrt -ldl -lm -lz -ltinfo -lxml2 $ llvm-config-17 --link-static --system-libs -lrt -ldl -lm -lz -lzstd -ltinfo -lxml2 ``` The current cmake rules try to find a "Findzstd.cmake" file located within the project, although this doesn't seem to exist, resulting in a compilation error. This commit adds a fallback to search the system for libzstd.a incase a "Findzstd.cmake" is not found. The zstd library is already installed as part of: https://github.com/apache/tvm/pull/15799/files#diff-c2c0605a8fdd4f5600690a8c7b1ec769882426af1b0ed01e8aaa0814e3a8f5dbR48 Change-Id: I19ab168f92d23e98809851f948e2122345ed01f1
|
I was trying to fix the zstd dependency a while ago but it unfortunately didn't work out :( |
|
BTW, |
|
Ah I missed #15479 thanks :)
Thanks that makes more sense. I wonder if we can rely on |
|
tbh I'm not an expert and don't have much idea what the best approach is. happy to get this PR in if it works! |
Use llvm-config to find the location of the "Find*.cmake" files and add this location to the cmake `CMAKE_MODULE_PATH` variable. This allows the build to discover "Findzstd.cmake". Change-Id: I3d25074fad3b2b8fa4c3d47e0e4c0b27d8739c65
lhutton1
changed the title
|
I feel like the new approach is more robust, but happy to revert @junrushao if you think otherwise |
|
BTW could you confirm if it works with LLVM-17 on Windows? I was having some trouble previously |
|
I'm afraid I don't have a windows machine at hand to check |
|
I think we should get this commit in anyways. In the worst case, it does no harm |
|
Well, I got the error below on Windows: |
|
It seems |
junrushao
added a commit
to junrushao/tvm
that referenced
this pull request
Nov 6, 2023
PR apache#16032 introduces a more stable way of zstd path finding by relying on LLVM's existing Findzstd module, but it turns out that the cmake dir from `llvm-config` is not very compatible with CMake's internal convention, and thus a conversion is required to get rid of the error message below: ``` -- Performing Test CMAKE_HAVE_LIBC_PTHREAD D:/a/package/package/tvm/build/CMakeFiles/CMakeScratch/TryCompile-tnlfb1/CMakeLists.txt:2 -- Configuring incomplete, errors occurred! when parsing string C:\Miniconda\envs\tlcpack-build\Library\lib\cmake\llvm Invalid character escape '\M'. ```
This was referenced Nov 6, 2023
Hzfengsy
pushed a commit
that referenced
this pull request
Nov 7, 2023
PR #16032 introduces a more stable way of zstd path finding by relying on LLVM's existing Findzstd module, but it turns out that the cmake dir from `llvm-config` is not very compatible with CMake's internal convention, and thus a conversion is required to get rid of the error message below: ``` -- Performing Test CMAKE_HAVE_LIBC_PTHREAD D:/a/package/package/tvm/build/CMakeFiles/CMakeScratch/TryCompile-tnlfb1/CMakeLists.txt:2 -- Configuring incomplete, errors occurred! when parsing string C:\Miniconda\envs\tlcpack-build\Library\lib\cmake\llvm Invalid character escape '\M'. ```
binarybana
pushed a commit
to binarybana/tvm
that referenced
this pull request
Nov 14, 2023
* [CMake] Fallback for finding static zstd library from the system LLVM17 now depends on `-lzstd` when the `--link-static` option is used. I.e: ``` $ llvm-config-16 --link-static --system-libs -lrt -ldl -lm -lz -ltinfo -lxml2 $ llvm-config-17 --link-static --system-libs -lrt -ldl -lm -lz -lzstd -ltinfo -lxml2 ``` The current cmake rules try to find a "Findzstd.cmake" file located within the project, although this doesn't seem to exist, resulting in a compilation error. This commit adds a fallback to search the system for libzstd.a incase a "Findzstd.cmake" is not found. The zstd library is already installed as part of: https://github.com/apache/tvm/pull/15799/files#diff-c2c0605a8fdd4f5600690a8c7b1ec769882426af1b0ed01e8aaa0814e3a8f5dbR48 Change-Id: I19ab168f92d23e98809851f948e2122345ed01f1 * Use llvm-config to locate Findzstd.cmake Use llvm-config to find the location of the "Find*.cmake" files and add this location to the cmake `CMAKE_MODULE_PATH` variable. This allows the build to discover "Findzstd.cmake". Change-Id: I3d25074fad3b2b8fa4c3d47e0e4c0b27d8739c65
binarybana
pushed a commit
to binarybana/tvm
that referenced
this pull request
Nov 14, 2023
PR apache#16032 introduces a more stable way of zstd path finding by relying on LLVM's existing Findzstd module, but it turns out that the cmake dir from `llvm-config` is not very compatible with CMake's internal convention, and thus a conversion is required to get rid of the error message below: ``` -- Performing Test CMAKE_HAVE_LIBC_PTHREAD D:/a/package/package/tvm/build/CMakeFiles/CMakeScratch/TryCompile-tnlfb1/CMakeLists.txt:2 -- Configuring incomplete, errors occurred! when parsing string C:\Miniconda\envs\tlcpack-build\Library\lib\cmake\llvm Invalid character escape '\M'. ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
LLVM17 now depends on
-lzstdwhen the--link-staticoption is used. I.e:The current cmake rules aren't able to find the "Findzstd.cmake", resulting in a cmake error. This commit uses
llvm-config --cmakedirto locate "Findzstd.cmake" which defines a set of rules to find zstd in the system. The zstd library is already installed as part of: https://github.com/apache/tvm/pull/15799/files#diff-c2c0605a8fdd4f5600690a8c7b1ec769882426af1b0ed01e8aaa0814e3a8f5dbR48