-
Notifications
You must be signed in to change notification settings - Fork 13.4k
[mlir python] Add nanobind support for standalone dialects. #117922
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
Merged
Merged
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
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
35 changes: 35 additions & 0 deletions
35
mlir/examples/standalone/python/StandaloneExtensionNanobind.cpp
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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| //===- StandaloneExtension.cpp - Extension module -------------------------===// | ||
| // | ||
| // This is the nanobind version of the example module. There is also a pybind11 | ||
| // example in StandaloneExtensionPybind11.cpp. | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #include <nanobind/nanobind.h> | ||
|
|
||
| #include "Standalone-c/Dialects.h" | ||
| #include "mlir/Bindings/Python/NanobindAdaptors.h" | ||
|
|
||
| namespace nb = nanobind; | ||
|
|
||
| NB_MODULE(_standaloneDialectsNanobind, m) { | ||
| //===--------------------------------------------------------------------===// | ||
| // standalone dialect | ||
| //===--------------------------------------------------------------------===// | ||
| auto standaloneM = m.def_submodule("standalone"); | ||
|
|
||
| standaloneM.def( | ||
| "register_dialect", | ||
| [](MlirContext context, bool load) { | ||
| MlirDialectHandle handle = mlirGetDialectHandle__standalone__(); | ||
| mlirDialectHandleRegisterDialect(handle, context); | ||
| if (load) { | ||
| mlirDialectHandleLoadDialect(handle, context); | ||
| } | ||
| }, | ||
| nb::arg("context").none() = nb::none(), nb::arg("load") = true); | ||
| } |
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
6 changes: 6 additions & 0 deletions
6
mlir/examples/standalone/python/mlir_standalone/dialects/standalone_pybind11.py
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 |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| # See https://llvm.org/LICENSE.txt for license information. | ||
| # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
|
|
||
| from ._standalone_ops_gen import * | ||
| from .._mlir_libs._standaloneDialectsPybind11.standalone import * |
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 |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| //===- Diagnostics.h - Helpers for diagnostics in Python bindings ---------===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #ifndef MLIR_BINDINGS_PYTHON_DIAGNOSTICS_H | ||
| #define MLIR_BINDINGS_PYTHON_DIAGNOSTICS_H | ||
|
|
||
| #include <cassert> | ||
| #include <string> | ||
|
|
||
| #include "mlir-c/Diagnostics.h" | ||
| #include "mlir-c/IR.h" | ||
| #include "llvm/ADT/StringRef.h" | ||
|
|
||
| namespace mlir { | ||
| namespace python { | ||
|
|
||
| /// RAII scope intercepting all diagnostics into a string. The message must be | ||
| /// checked before this goes out of scope. | ||
| class CollectDiagnosticsToStringScope { | ||
| public: | ||
| explicit CollectDiagnosticsToStringScope(MlirContext ctx) : context(ctx) { | ||
| handlerID = mlirContextAttachDiagnosticHandler(ctx, &handler, &errorMessage, | ||
| /*deleteUserData=*/nullptr); | ||
| } | ||
| ~CollectDiagnosticsToStringScope() { | ||
| assert(errorMessage.empty() && "unchecked error message"); | ||
| mlirContextDetachDiagnosticHandler(context, handlerID); | ||
| } | ||
|
|
||
| [[nodiscard]] std::string takeMessage() { return std::move(errorMessage); } | ||
|
|
||
| private: | ||
| static MlirLogicalResult handler(MlirDiagnostic diag, void *data) { | ||
| auto printer = +[](MlirStringRef message, void *data) { | ||
| *static_cast<std::string *>(data) += | ||
| llvm::StringRef(message.data, message.length); | ||
| }; | ||
| MlirLocation loc = mlirDiagnosticGetLocation(diag); | ||
| *static_cast<std::string *>(data) += "at "; | ||
| mlirLocationPrint(loc, printer, data); | ||
| *static_cast<std::string *>(data) += ": "; | ||
| mlirDiagnosticPrint(diag, printer, data); | ||
| return mlirLogicalResultSuccess(); | ||
| } | ||
|
|
||
| MlirContext context; | ||
| MlirDiagnosticHandlerID handlerID; | ||
| std::string errorMessage = ""; | ||
| }; | ||
|
|
||
| } // namespace python | ||
| } // namespace mlir | ||
|
|
||
| #endif // MLIR_BINDINGS_PYTHON_DIAGNOSTICS_H |
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.
I was imagining this would be an arg (that naturally defaulted to
mlir) so that downstream users could set this to whatever they wanted (if they wanted).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.
Let's do that in a follow-on change?
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.
Sure np