-
Notifications
You must be signed in to change notification settings - Fork 14.7k
[mlir][python] automatic ___location inference #151246
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
Open
makslevental
wants to merge
4
commits into
llvm:main
Choose a base branch
from
makslevental:makslevental/auto-locs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,9 +13,9 @@ | |
|
||
#include "Globals.h" | ||
#include "NanobindUtils.h" | ||
#include "mlir-c/Bindings/Python/Interop.h" | ||
#include "mlir-c/Support.h" | ||
#include "mlir/Bindings/Python/Nanobind.h" | ||
#include "mlir-c/Bindings/Python/Interop.h" // This is expected after nanobind. | ||
|
||
namespace nb = nanobind; | ||
using namespace mlir; | ||
|
@@ -197,3 +197,71 @@ PyGlobals::lookupOperationClass(llvm::StringRef operationName) { | |
// Not found and loading did not yield a registration. | ||
return std::nullopt; | ||
} | ||
|
||
bool PyGlobals::TracebackLoc::locTracebacksEnabled() { | ||
nanobind::ft_lock_guard lock(mutex); | ||
return locTracebackEnabled_; | ||
makslevental marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
void PyGlobals::TracebackLoc::setLocTracebacksEnabled(bool value) { | ||
nanobind::ft_lock_guard lock(mutex); | ||
locTracebackEnabled_ = value; | ||
} | ||
|
||
size_t PyGlobals::TracebackLoc::locTracebackFramesLimit() { | ||
nanobind::ft_lock_guard lock(mutex); | ||
return locTracebackFramesLimit_; | ||
} | ||
|
||
void PyGlobals::TracebackLoc::setLocTracebackFramesLimit(size_t value) { | ||
nanobind::ft_lock_guard lock(mutex); | ||
locTracebackFramesLimit_ = value; | ||
} | ||
|
||
void PyGlobals::TracebackLoc::registerTracebackFileInclusion( | ||
const std::string &file) { | ||
nanobind::ft_lock_guard lock(mutex); | ||
auto reg = "^" + llvm::Regex::escape(file); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So this always has to match prefix? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is the choice JAX made so I went with it - I think it's reasonable wrt being conservative. |
||
if (userTracebackIncludeFiles.insert(reg).second) | ||
rebuildUserTracebackIncludeRegex = true; | ||
if (userTracebackExcludeFiles.count(reg)) { | ||
if (userTracebackExcludeFiles.erase(reg)) | ||
rebuildUserTracebackExcludeRegex = true; | ||
} | ||
} | ||
|
||
void PyGlobals::TracebackLoc::registerTracebackFileExclusion( | ||
const std::string &file) { | ||
nanobind::ft_lock_guard lock(mutex); | ||
auto reg = "^" + llvm::Regex::escape(file); | ||
if (userTracebackExcludeFiles.insert(reg).second) | ||
rebuildUserTracebackExcludeRegex = true; | ||
if (userTracebackIncludeFiles.count(reg)) { | ||
if (userTracebackIncludeFiles.erase(reg)) | ||
rebuildUserTracebackIncludeRegex = true; | ||
} | ||
} | ||
|
||
bool PyGlobals::TracebackLoc::isUserTracebackFilename( | ||
const llvm::StringRef file) { | ||
nanobind::ft_lock_guard lock(mutex); | ||
if (rebuildUserTracebackIncludeRegex) { | ||
userTracebackIncludeRegex.assign( | ||
llvm::join(userTracebackIncludeFiles, "|")); | ||
rebuildUserTracebackIncludeRegex = false; | ||
isUserTracebackFilenameCache.clear(); | ||
} | ||
if (rebuildUserTracebackExcludeRegex) { | ||
userTracebackExcludeRegex.assign( | ||
llvm::join(userTracebackExcludeFiles, "|")); | ||
rebuildUserTracebackExcludeRegex = false; | ||
isUserTracebackFilenameCache.clear(); | ||
} | ||
if (!isUserTracebackFilenameCache.contains(file)) { | ||
std::string fileStr = file.str(); | ||
bool include = std::regex_search(fileStr, userTracebackIncludeRegex); | ||
bool exclude = std::regex_search(fileStr, userTracebackExcludeRegex); | ||
isUserTracebackFilenameCache[file] = include || !exclude; | ||
} | ||
return isUserTracebackFilenameCache[file]; | ||
} |
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.
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.
I was going to say the name would make me think its overriding and suggeste append. But I see this is consistent with the diagnostic handlers wording.