Skip to content
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

[mlir][python][cmake] Allows for specifying NB_DOMAIN in add_mlir_python_extension #122865

Merged
merged 3 commits into from
Jan 16, 2025

Conversation

erwei-xilinx
Copy link
Contributor

This PR allows the users to specify the NB_DOMAIN for add_mlir_python_extension. This allows users to avoid nanobind domain conflicts, when python bindings from multiple mlir projects were imported. (https://nanobind.readthedocs.io/en/latest/faq.html#how-can-i-avoid-conflicts-with-other-projects-using-nanobind)

Copy link

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@llvmbot llvmbot added the mlir label Jan 14, 2025
@llvmbot
Copy link
Member

llvmbot commented Jan 14, 2025

@llvm/pr-subscribers-mlir

Author: None (erwei-xilinx)

Changes

This PR allows the users to specify the NB_DOMAIN for add_mlir_python_extension. This allows users to avoid nanobind domain conflicts, when python bindings from multiple mlir projects were imported. (https://nanobind.readthedocs.io/en/latest/faq.html#how-can-i-avoid-conflicts-with-other-projects-using-nanobind)


Full diff: https://github.com/llvm/llvm-project/pull/122865.diff

1 Files Affected:

  • (modified) mlir/cmake/modules/AddMLIRPython.cmake (+8-1)
diff --git a/mlir/cmake/modules/AddMLIRPython.cmake b/mlir/cmake/modules/AddMLIRPython.cmake
index 0679db9cf93e19..82a93c1a3c78c9 100644
--- a/mlir/cmake/modules/AddMLIRPython.cmake
+++ b/mlir/cmake/modules/AddMLIRPython.cmake
@@ -658,6 +658,13 @@ function(add_mlir_python_extension libname extname)
     set(eh_rtti_enable -frtti -fexceptions)
   endif ()
 
+  # Avoids domain conflict with nanobind by specifying NB_DOMAIN.
+  if(NB_DOMAIN)
+    set(_nb_domain ${NB_DOMAIN})
+  else()
+    set(_nb_domain "mlir")
+  endif ()
+
   # The actual extension library produces a shared-object or DLL and has
   # sources that must be compiled in accordance with pybind11 needs (RTTI and
   # exceptions).
@@ -667,7 +674,7 @@ function(add_mlir_python_extension libname extname)
     )
   elseif(ARG_PYTHON_BINDINGS_LIBRARY STREQUAL "nanobind")
     nanobind_add_module(${libname}
-      NB_DOMAIN mlir
+      NB_DOMAIN ${_nb_domain}
       FREE_THREADED
       ${ARG_SOURCES}
     )

@erwei-xilinx
Copy link
Contributor Author

@makslevental

@makslevental
Copy link
Contributor

makslevental commented Jan 14, 2025

I prefer if this were an argument to add_mlir_python_extension rather than a global but maybe a global is fine? @jpienaar @hawkinsp what do you guys think?

Edit: hmm I guess (duh) you need to expose this to downstream people that are just building the upstream extension without using add_mlir_python_extension explicitly. So on second thought @erwei-xilinx can you please promote this to a full global called MLIR_BINDINGS_PYTHON_NB_DOMAIN with something like

set(MLIR_BINDINGS_PYTHON_NB_DOMAIN "mlir" 
  CACHE STRING "nanobind domain for MLIR python bindings")

You can put it right by MLIR_BINDINGS_PYTHON here https://github.com/llvm/llvm-project/blob/main/mlir/CMakeLists.txt#L177

@makslevental makslevental self-requested a review January 14, 2025 11:16
@erwei-xilinx
Copy link
Contributor Author

I prefer if this were an argument to add_mlir_python_extension rather than a global but maybe a global is fine? @jpienaar @hawkinsp what do you guys think?

Edit: hmm I guess (duh) you need to expose this to downstream people that are just building the upstream extension without using add_mlir_python_extension explicitly. So on second thought @erwei-xilinx can you please promote this to a full global called MLIR_BINDINGS_PYTHON_NB_DOMAIN with something like

Sure, makes sense. PR updated. Thanks for the comment.

else()
set(_nb_domain "mlir")
endif()

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't really needed anymore right? Can just move ${MLIR_BINDINGS_PYTHON_NB_DOMAIN} down to the nanobind_add_module call site.

Copy link
Contributor Author

@erwei-xilinx erwei-xilinx Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is still needed. In our project when we directly call the add_mlir_python_module method, it didn't inherit the cache default in the MLIR build's CMakeCache. Instead the MLIR_BINDINGS_PYTHON_NB_DOMAIN global variable was left undefined.

I see your point. If called from outside then it's the caller's responsibility to supply reasonable variables.

Copy link
Contributor

@makslevental makslevental left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks

@makslevental
Copy link
Contributor

@erwei-xilinx let me know if you need me to merge

@erwei-xilinx
Copy link
Contributor Author

@erwei-xilinx let me know if you need me to merge

Yeah that would be great as I do not have permission to start the check nor merge the PR. Thanks!

@makslevental makslevental merged commit 9e863cd into llvm:main Jan 16, 2025
7 checks passed
Copy link

@erwei-xilinx Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

@erwei-xilinx erwei-xilinx deleted the custom_nb_domain branch January 16, 2025 19:03
DKLoehr pushed a commit to DKLoehr/llvm-project that referenced this pull request Jan 17, 2025
…python_extension` (llvm#122865)

This PR allows the users to specify the `NB_DOMAIN` for
`add_mlir_python_extension`. This allows users to avoid nanobind domain
conflicts, when python bindings from multiple `mlir` projects were
imported.
(https://nanobind.readthedocs.io/en/latest/faq.html#how-can-i-avoid-conflicts-with-other-projects-using-nanobind)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants