feat: add option to build without pybind11

Author: gvartany-amd

CMakeLists.txt

@@ -15,6 +15,12 @@ option(ONNX_MLIR_INSTALL_HEADERS "Install onnx-mlir headers" ON)
 option(ONNX_MLIR_INSTALL_LIBS "Install onnx-mlir libraries" ON)
 option(ONNX_MLIR_INSTALL_PYTHON_EXTENSIONS "Install onnx-mlir python bindings" ON)
 option(ONNX_MLIR_ENABLE_PYRUNTIME_LIGHT "Set to ON for building Python driver of running the compiled model without llvm-project." OFF)
+option(ONNX_MLIR_ENABLE_PYBIND "Set to OFF for building without pybind11 or the relevant tests." ON)
+
+if (NOT ONNX_MLIR_ENABLE_PYBIND)
+  set(ONNX_MLIR_ENABLE_PYRUNTIME_LIGHT OFF)
+  set(ONNX_MLIR_INSTALL_PYTHON_EXTENSIONS OFF)
+endif()
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -183,9 +189,13 @@ if (ONNX_MLIR_ENABLE_PYRUNTIME_LIGHT)
   add_subdirectory(third_party/onnx)
   add_subdirectory(third_party/pybind11)
 else()
-  set(pybind11_FIND_QUIETLY ON)
+  if (ONNX_MLIR_ENABLE_PYBIND)
+    set(pybind11_FIND_QUIETLY ON)
+    add_subdirectory(third_party/pybind11)
+  else()
+    set(BUILD_ONNX_PYTHON FALSE) # prevent onnx from using pybind
+  endif()
   add_subdirectory(third_party/onnx EXCLUDE_FROM_ALL)
-  add_subdirectory(third_party/pybind11)
   add_subdirectory(third_party/rapidcheck EXCLUDE_FROM_ALL)
 
   if (ONNX_MLIR_ENABLE_STABLEHLO)

docs/doc_example/CMakeLists.txt

@@ -77,28 +77,30 @@ add_onnx_mlir_executable(OMRuntimeTest
 
 set_output_directory(OMRuntimeTest BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
-add_onnx_mlir_executable(OMRuntimeCppTest
-  main.cpp
+if (ONNX_MLIR_ENABLE_PYBIND)
+  add_onnx_mlir_executable(OMRuntimeCppTest
+    main.cpp
 
-  NO_INSTALL
+    NO_INSTALL
 
-  INCLUDE_DIRS PRIVATE
-  ${ONNX_MLIR_SRC_ROOT}/include
+    INCLUDE_DIRS PRIVATE
+    ${ONNX_MLIR_SRC_ROOT}/include
 
-  LINK_LIBS PRIVATE
-  OMCompiler
-  OMExecutionSession
-  )
+    LINK_LIBS PRIVATE
+    OMCompiler
+    OMExecutionSession
+    )
 
-set_output_directory(OMRuntimeCppTest BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+  set_output_directory(OMRuntimeCppTest BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
-add_test(NAME OMRuntimeTest COMMAND OMRuntimeTest WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-set_property(TARGET OMRuntimeTest PROPERTY FOLDER "Docs")
-set_tests_properties(OMRuntimeTest PROPERTIES LABELS doc-example)
-add_dependencies(doc-example OMRuntimeTest)
+  add_test(NAME OMRuntimeTest COMMAND OMRuntimeTest WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  set_property(TARGET OMRuntimeTest PROPERTY FOLDER "Docs")
+  set_tests_properties(OMRuntimeTest PROPERTIES LABELS doc-example)
+  add_dependencies(doc-example OMRuntimeTest)
 
-add_test(NAME OMRuntimeCppTest COMMAND OMRuntimeCppTest WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-set_property(TARGET OMRuntimeCppTest PROPERTY FOLDER "Docs")
-set_tests_properties(OMRuntimeCppTest PROPERTIES LABELS doc-example)
-set_tests_properties(OMRuntimeCppTest PROPERTIES ENVIRONMENT "ONNX_MLIR_LIBRARY_PATH=${ONNX_MLIR_LIBRARY_PATH}")
-add_dependencies(doc-example OMRuntimeCppTest)
+  add_test(NAME OMRuntimeCppTest COMMAND OMRuntimeCppTest WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  set_property(TARGET OMRuntimeCppTest PROPERTY FOLDER "Docs")
+  set_tests_properties(OMRuntimeCppTest PROPERTIES LABELS doc-example)
+  set_tests_properties(OMRuntimeCppTest PROPERTIES ENVIRONMENT "ONNX_MLIR_LIBRARY_PATH=${ONNX_MLIR_LIBRARY_PATH}")
+  add_dependencies(doc-example OMRuntimeCppTest)
+endif()

include/onnx-mlir/Runtime/CMakeLists.txt

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if(ONNX_MLIR_INSTALL_HEADERS)
+if(ONNX_MLIR_INSTALL_HEADERS AND ONNX_MLIR_ENABLE_PYBIND)
   install(FILES OMEntryPoint.h DESTINATION include/onnx-mlir/Runtime)
   install(FILES OMInstrument.h DESTINATION include/onnx-mlir/Runtime)
   install(FILES OMSignature.h DESTINATION include/onnx-mlir/Runtime)

src/Compiler/CMakeLists.txt

@@ -209,12 +209,14 @@ add_onnx_mlir_library(OMCompilerUtils
 # CompilerUtils does not require cruntime or jniruntime to build,
 # however, they are required for execution when using the EmitLib or EmitJNI
 # options
-add_dependencies(OMCompilerUtils cruntime)
-if (ONNX_MLIR_ENABLE_JNI)
-  add_dependencies(OMCompilerUtils jniruntime)
-endif()
-if (TARGET omp)
-  add_dependencies(OMCompilerUtils ompruntime)
+if (ONNX_MLIR_ENABLE_PYBIND)
+  add_dependencies(OMCompilerUtils cruntime)
+  if (ONNX_MLIR_ENABLE_JNI)
+    add_dependencies(OMCompilerUtils jniruntime)
+  endif()
+  if (TARGET omp)
+    add_dependencies(OMCompilerUtils ompruntime)
+  endif()
 endif()
 
 add_onnx_mlir_library(OMCompiler
@@ -239,29 +241,31 @@ if (NOT BUILD_SHARED_LIBS)
   target_compile_definitions(OMCompiler PUBLIC ONNX_MLIR_BUILT_AS_STATIC)
 endif()
 
-pybind11_add_module(PyCompile PyOMCompileSession.cpp)
-add_dependencies(PyCompile onnx_proto)
-if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-  target_compile_options(PyCompile PRIVATE /EHsc /GR)
-elseif (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
-  target_compile_options(PyCompile PRIVATE -frtti -fexceptions)
-endif()
-
-target_compile_definitions(PyCompile
-  PRIVATE
-  $<TARGET_PROPERTY:onnx,COMPILE_DEFINITIONS>
-  )
-target_include_directories(PyCompile
-  PRIVATE
-  $<TARGET_PROPERTY:onnx,INCLUDE_DIRECTORIES>
-  )
-target_link_libraries(PyCompile
-  PRIVATE
-  OMCompiler
-  )
+if (ONNX_MLIR_ENABLE_PYBIND)
+  pybind11_add_module(PyCompile PyOMCompileSession.cpp)
+  add_dependencies(PyCompile onnx_proto)
+  if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+    target_compile_options(PyCompile PRIVATE /EHsc /GR)
+  elseif (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
+    target_compile_options(PyCompile PRIVATE -frtti -fexceptions)
+  endif()
 
-if(ONNX_MLIR_INSTALL_PYTHON_EXTENSIONS)
-  install(TARGETS PyCompile
-    DESTINATION lib
+  target_compile_definitions(PyCompile
+    PRIVATE
+    $<TARGET_PROPERTY:onnx,COMPILE_DEFINITIONS>
+    )
+  target_include_directories(PyCompile
+    PRIVATE
+    $<TARGET_PROPERTY:onnx,INCLUDE_DIRECTORIES>
     )
+  target_link_libraries(PyCompile
+    PRIVATE
+    OMCompiler
+    )
+
+  if(ONNX_MLIR_INSTALL_PYTHON_EXTENSIONS)
+    install(TARGETS PyCompile
+      DESTINATION lib
+      )
+  endif()
 endif()

src/Runtime/CMakeLists.txt

@@ -1,6 +1,11 @@
 
 # SPDX-License-Identifier: Apache-2.0
 
+# Runtime depends on pybind11, skip it if unavailable
+if (NOT ONNX_MLIR_ENABLE_PYBIND)
+  return()
+endif()
+
 if (NOT ONNX_MLIR_ENABLE_PYRUNTIME_LIGHT)
 add_subdirectory(jni)
 add_subdirectory(omp)

test/accelerators/NNPA/backend/CMakeLists.txt

@@ -1,5 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
+# Disabled when pybind unavailable.
+if (NOT ONNX_MLIR_ENABLE_PYBIND)
+  return()
+endif()
+
+
 set(ONNX_BACKENDTEST_SRC_DIR ${ONNX_MLIR_SRC_ROOT}/test/backend)
 
 file(GENERATE

test/backend/CMakeLists.txt

@@ -1,5 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
+# Disabled when pybind unavailable.
+if (NOT ONNX_MLIR_ENABLE_PYBIND)
+  return()
+endif()
+
 file(GENERATE
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/conftest.py
   INPUT ${CMAKE_CURRENT_SOURCE_DIR}/conftest.py

test/modellib/CMakeLists.txt

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if (NOT ONNX_MLIR_ENABLE_PYBIND)
+  return()
+endif()
+
 add_onnx_mlir_library(ModelLib
   CategoryMapperModel.cpp
   ConvModel.cpp

test/multiple-models/CMakeLists.txt

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if (NOT ONNX_MLIR_ENABLE_PYBIND)
+  return()
+endif()
+
 if (NOT ONNX_MLIR_BUILD_TESTS)
   set(EXCLUDE_FROM_ALL ON)
 endif()

test/unit/CMakeLists.txt

@@ -34,7 +34,8 @@ function(add_onnx_mlir_unittest test_name)
   set_tests_properties(${test_name} PROPERTIES LABELS unittest)
 endfunction()
 
-add_onnx_mlir_unittest(TestInstrumentation
+if (ONNX_MLIR_ENABLE_PYBIND)
+  add_onnx_mlir_unittest(TestInstrumentation
   TestInstrumentation.cpp
 
   INCLUDE_DIRS PUBLIC
@@ -43,6 +44,7 @@ add_onnx_mlir_unittest(TestInstrumentation
   LINK_LIBS PRIVATE
   cruntime
   )
+endif()
 
 add_subdirectory(BType)
 add_subdirectory(CustomFn)