Quick CMake fixes enabled by 3.28 #8365
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
Having the dummy file on disk is confusing and is easy to accidentally install when modifying CMake install rules. Better to use the CMake 3.24+ feature of the package redirects dir to truly disable find_package for Halide inside the build.
steven-johnson
approved these changes
Aug 1, 2024
|
Converting to draft because I'm going to fold a few more small diffs into here. Stand by. |
alexreinking
force-pushed
the
build/quick-fixes
branch
from
3c5024a to
2cdcaad
Compare
alexreinking
changed the title
alexreinking
force-pushed
the
build/quick-fixes
branch
from
2cdcaad to
77baeda
Compare
This avoids sending a generator expression downstream. These are functionally identical, but it's just one less thing to evaluate.
| @@ -338,6 +338,7 @@ set(SOURCE_FILES | |||
| SlidingWindow.cpp | |||
| Solve.cpp | |||
| SpirvIR.cpp | |||
| SpirvIR.h | |||
There was a problem hiding this comment.
Why is this a source file and not a header file?-
There was a problem hiding this comment.
Because we specifically do not want to include it in the set of headers that becomes Halide.h as this header includes the upstream SpirvIR headers.
There was a problem hiding this comment.
Gotcha, may I suggest adding a comment so this doesn't get "fixed" in the future
There was a problem hiding this comment.
There will be a comment in the PR following the GenGen one; this PR is just meant to minimize future diffs.
1 task
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.
Trying to carve out pieces of #8360 that are easy to review/land individually. Here are a few quick fixes:
find_package(Halide), rather than polluting our source tree with a dummy file.find_package(CUDAToolkit)in apps/cuda_mat_mulSpirvIR.hto the list of sources, not public headers. This won't put it inHalide.h, but it will put it in IDE file lists.BUILD_LOCAL_INTERFACEinstead ofBUILD_INTERFACE(this is even more private)