maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mlir][Python] Adapt to include property change in pybind11 v2.6. 

Reviewed By: mehdi_amini

Differential Revision: https://reviews.llvm.org/D90955
This commit is contained in:
Stella Laurenzo 2020-11-07 09:05:51 -08:00
parent b5fcd06105
commit 9bda935289
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mlir/CMakeLists.txt
View File

@ -81,9 +81,13 @@ if(MLIR_BINDINGS_PYTHON_ENABLED)
find_package(PythonInterp REQUIRED) find_package(PythonInterp REQUIRED)
find_package(PythonLibs REQUIRED) find_package(PythonLibs REQUIRED)
message(STATUS "Found python include dirs: ${PYTHON_INCLUDE_DIRS}") message(STATUS "Found python include dirs: ${PYTHON_INCLUDE_DIRS}")
message(STATUS "Found ppython libraries: ${PYTHON_LIBRARIES}") message(STATUS "Found python libraries: ${PYTHON_LIBRARIES}")
find_package(pybind11 CONFIG REQUIRED) find_package(pybind11 CONFIG REQUIRED)
message(STATUS "Found pybind11 v${pybind11_VERSION}: ${pybind11_INCLUDE_DIRS}") # TODO: pybind11 v2.6 switched from pybind11_INCLUDE_DIRS (plural) to
# pybind11_INCLUDE_DIR (singular). A lot has changed in this area since this
# was written and overall python config and pybind11 should be modernized.
set(pybind11_INCLUDE_DIR ${pybind11_INCLUDE_DIR} ${pybind11_INCLUDE_DIRS})
message(STATUS "Found pybind11 v${pybind11_VERSION}: ${pybind11_INCLUDE_DIR}")
message(STATUS "Python prefix = '${PYTHON_MODULE_PREFIX}', " message(STATUS "Python prefix = '${PYTHON_MODULE_PREFIX}', "
"suffix = '${PYTHON_MODULE_SUFFIX}', " "suffix = '${PYTHON_MODULE_SUFFIX}', "
"extension = '${PYTHON_MODULE_EXTENSION}") "extension = '${PYTHON_MODULE_EXTENSION}")

2
mlir/cmake/modules/AddMLIRPythonExtension.cmake
View File

@ -44,7 +44,7 @@ function(add_mlir_python_extension libname extname)
target_include_directories(${libname} PRIVATE target_include_directories(${libname} PRIVATE
"${PYTHON_INCLUDE_DIRS}" "${PYTHON_INCLUDE_DIRS}"
"${pybind11_INCLUDE_DIRS}" "${pybind11_INCLUDE_DIR}"
) )
# The extension itself must be compiled with RTTI and exceptions enabled. # The extension itself must be compiled with RTTI and exceptions enabled.