Repository navigation
refactor(bazel): patch the kernel defines with a stock Bazel action #3831
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Alexandr-Solovev
wants to merge
4
commits into
uxlfoundation:main
from
Alexandr-Solovev:dev/asolovev_bazel_drop_extra_toolchain
Closed
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
8ffcb3a
refactor(bazel): remove dead code and fix the template file name typo
Alexandr-Solovev e103b1b
refactor(bazel): share the platform-independent toolchain config
Alexandr-Solovev ef5acc7
refactor(bazel): patch the kernel defines with a stock Bazel action
Alexandr-Solovev ab76a83
bazel: anchor the kernel-define substitution on the whole line
Alexandr-Solovev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a literal, unanchored replace, so it also hits longer macro names and any other mention of the macro. Demonstrated by adding two lines to the header and building with
--cpu=sse2:Make's
sed 's/^#define DAAL_KERNEL_X\b//'leaves both lines alone. The docstring's "mentions those macros nowhere else" holds today but nothing enforces it; it breaks silently the day someone adds anAVX2_VNNI/AVX512_*style variant.Anchoring on the whole line keeps it equivalent, e.g. key
"\n#define DAAL_KERNEL_{}\n".format(cpu.upper())->"\n\r\n" if is_windows else "\n\n"(the header iseol=lfper.gitattributes, and no define sits on line 1).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed, fixed in ab76a83: the key is now
"\n#define DAAL_KERNEL_<ISA>\n"->"\n\n"("\n\r\n"on Windows), and the docstring is updated. I checked it with your two lines added and--cpu=sse2: AVX2 and AVX512 are blanked (adjacent defines still match one after another, since each replacement keeps its trailing newline), and#define DAAL_KERNEL_AVX2_VNNIand the/* mirrors ... */comment pass through unchanged.