[all-commits] [llvm/llvm-project] 132bc6: Re-apply "[mlir] Allow out-of-tree python building...

Stella Laurenzo via All-commits all-commits at lists.llvm.org
Sun Nov 14 20:32:02 PST 2021


  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 132bc6e2d48122823101a058e25b7b317b885a81
      https://github.com/llvm/llvm-project/commit/132bc6e2d48122823101a058e25b7b317b885a81
  Author: Stella Laurenzo <stellaraccident at gmail.com>
  Date:   2021-11-14 (Sun, 14 Nov 2021)

  Changed paths:
    M mlir/cmake/modules/AddMLIRPython.cmake
    M mlir/cmake/modules/MLIRConfig.cmake.in
    M mlir/examples/standalone/CMakeLists.txt
    M mlir/examples/standalone/include/Standalone/StandaloneOps.td
    A mlir/examples/standalone/python/CMakeLists.txt
    A mlir/examples/standalone/python/StandaloneExtension.cpp
    A mlir/examples/standalone/python/mlir_standalone/dialects/StandaloneOps.td
    A mlir/examples/standalone/python/mlir_standalone/dialects/standalone.py
    M mlir/examples/standalone/test/CMakeLists.txt
    M mlir/examples/standalone/test/lit.cfg.py
    M mlir/examples/standalone/test/lit.site.cfg.py.in
    A mlir/examples/standalone/test/python/lit.local.cfg
    A mlir/examples/standalone/test/python/smoketest.py
    M mlir/python/CMakeLists.txt
    M mlir/test/Examples/standalone/lit.local.cfg
    M mlir/test/Examples/standalone/test.toy
    M mlir/test/lit.site.cfg.py.in

  Log Message:
  -----------
  Re-apply "[mlir] Allow out-of-tree python building from installed MLIR."

Re-applies D111513:
* Adds a full-fledged Python example dialect and tests to the Standalone example (need to do a bit of tweaking in the top level CMake and lit tests to adapt better to if not building with Python enabled).
* Rips out remnants of custom extension building in favor of pybind11_add_module which does the right thing.
* Makes python and extension sources installable (outputs to src/python/${name} in the install tree): Both Python and C++ extension sources get installed as downstreams need all of this in order to build a derived version of the API.
* Exports sources targets (with our properties that make everything work) by converting them to INTERFACE libraries (which have export support), as recommended for the forseeable future by CMake devs. Renames custom properties to start with lower-case letter, as also recommended/required (groan).
* Adds a ROOT_DIR argument to declare_mlir_python_extension since now all C++ sources for an extension must be under the same directory (to line up at install time).
* Downstreams will need to adapt by:

  * Remove absolute paths from any SOURCES for declare_mlir_python_extension (I believe all downstreams are just using ${CMAKE_CURRENT_SOURCE_DIR} here, which can just be ommitted). May need to set ROOT_DIR if not relative to the current source directory.
  * To allow further downstreams to install/build, will need to make sure that all C++ extension headers are also listed under SOURCES for declare_mlir_python_extension.

This reverts commit 1a6c26d1f52999edbfbf6a978ae3f0e6759ea755.

Reviewed By: stephenneuendorffer

Differential Revision: https://reviews.llvm.org/D113732




More information about the All-commits mailing list