pass test

Signed-off-by: Chen Tong <chentong@us.ibm.com>
onnx · chentong319 · Jan 29, 2025 · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025
commit 4ab6256e9fac14bfc74282a971086cd50f64d8dd
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,8 @@ option(ONNX_MLIR_ENABLE_STABLEHLO "Enable StableHLO support." ON)
 option(ONNX_MLIR_ENABLE_WERROR "Enable warnings as errors." OFF)
 option(ONNX_MLIR_SUPPRESS_THIRD_PARTY_WARNINGS "Suppress warning in third_party code." ON)
 option(ONNX_MLIR_ENABLE_JAVA "Set to ON for building the Java runtime, tools, and tests" ON)
+option(ONNX_MLIR_ENABLE_PYRUNTIME_LIT "Set to ON for building Python driver of running the compiled model without llvm-project." OFF)
+#unset(ONNX_MLIR_ENABLE_PYRUNTIME_LIT CACHE)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -73,8 +75,10 @@ set(ONNX_MLIR_INCLUDE_PATH ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
 set(ONNX_MLIR_VENDOR ${PACKAGE_VENDOR} CACHE STRING
   "Vendor-specific text for showing with version information.")
 
-include(CTest)
-include(ExternalProject)
+if(NOT ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
+  include(CTest)
+  include(ExternalProject)
+endif()
 include(MLIR.cmake)
 
 # MLIR.cmake calls find_package(MLIR) which sets LLVM_MINIMUM_PYTHON_VERSION
@@ -159,23 +163,29 @@ endif()
 set(CMAKE_MESSAGE_LOG_LEVEL NOTICE)
 
 # Add third party subdirectories and define options appropriate to run their cmakes.
-set(pybind11_FIND_QUIETLY ON)
-add_subdirectory(third_party/onnx)
-add_subdirectory(third_party/pybind11)
-add_subdirectory(third_party/rapidcheck)
+if (ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
+  add_subdirectory(third_party/onnx)
+  add_subdirectory(third_party/pybind11)
+else()
+  set(pybind11_FIND_QUIETLY ON)
+  add_subdirectory(third_party/onnx)
+  add_subdirectory(third_party/pybind11)
 
-if (ONNX_MLIR_ENABLE_STABLEHLO)
-  add_subdirectory(third_party/stablehlo EXCLUDE_FROM_ALL)
-endif()
+  add_subdirectory(third_party/rapidcheck)
 
-if (NOT TARGET benchmark)
-  set(BENCHMARK_USE_BUNDLED_GTEST OFF)
-  set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
-  set(BENCHMARK_ENABLE_TESTING OFF)
-  set(BENCHMARK_ENABLE_WERROR OFF)
-  # Since LLVM requires C++11 (or higher) it is safe to assume that std::regex is available.
-  set(HAVE_STD_REGEX ON CACHE BOOL "OK" FORCE)
-  add_subdirectory(third_party/benchmark)
+  if (ONNX_MLIR_ENABLE_STABLEHLO)
+    add_subdirectory(third_party/stablehlo EXCLUDE_FROM_ALL)
+  endif()
+
+  if (NOT TARGET benchmark)
+    set(BENCHMARK_USE_BUNDLED_GTEST OFF)
+    set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+    set(BENCHMARK_ENABLE_TESTING OFF)
+    set(BENCHMARK_ENABLE_WERROR OFF)
+    # Since LLVM requires C++11 (or higher) it is safe to assume that std::regex is available.
+    set(HAVE_STD_REGEX ON CACHE BOOL "OK" FORCE)
+    add_subdirectory(third_party/benchmark)
+  endif()
 endif()
 
 # All libraries and executables coming from llvm or ONNX-MLIR have had their
@@ -207,8 +217,12 @@ if (ONNX_MLIR_ENABLE_STABLEHLO)
   add_compile_definitions(ONNX_MLIR_ENABLE_STABLEHLO)
 endif()
 
-add_subdirectory(utils)
-add_subdirectory(include)
-add_subdirectory(src)
-add_subdirectory(docs)
-add_subdirectory(test)
+if (ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
+  add_subdirectory(src)
+else()
+  add_subdirectory(utils)
+  add_subdirectory(include)
+  add_subdirectory(src)
+  add_subdirectory(docs)
+  add_subdirectory(test)
+endif()
diff --git a/MLIR.cmake b/MLIR.cmake
@@ -1,33 +1,39 @@
 # SPDX-License-Identifier: Apache-2.0
 
-# Must unset LLVM_DIR in cache. Otherwise, when MLIR_DIR changes LLVM_DIR
-# won't change accordingly.
-unset(LLVM_DIR CACHE)
-if (NOT DEFINED MLIR_DIR)
-  message(FATAL_ERROR "MLIR_DIR is not configured but it is required. "
-    "Set the cmake option MLIR_DIR, e.g.,\n"
-    "    cmake -DMLIR_DIR=/path/to/llvm-project/build/lib/cmake/mlir ..\n"
-    )
-endif()
+message(STATUS "ONNX_MLIR_ENABLE_PYRUNTIME_LIT: ${ONNX_MLIR_ENABLE_PYRUNTIE_LIT}")
+if (ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
+  function(llvm_update_compile_flags name)
+  endfunction()
+else()
+  # Must unset LLVM_DIR in cache. Otherwise, when MLIR_DIR changes LLVM_DIR
+  # won't change accordingly.
+  unset(LLVM_DIR CACHE)
+  if (NOT DEFINED MLIR_DIR)
+    message(FATAL_ERROR "MLIR_DIR is not configured but it is required. "
+      "Set the cmake option MLIR_DIR, e.g.,\n"
+      "    cmake -DMLIR_DIR=/path/to/llvm-project/build/lib/cmake/mlir ..\n"
+      )
+  endif()
 
-find_package(MLIR REQUIRED CONFIG)
+  find_package(MLIR REQUIRED CONFIG)
 
-message(STATUS "Using MLIRConfig.cmake in: ${MLIR_DIR}")
-message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+  message(STATUS "Using MLIRConfig.cmake in: ${MLIR_DIR}")
+  message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
-list(APPEND CMAKE_MODULE_PATH "${MLIR_CMAKE_DIR}")
-list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
+  list(APPEND CMAKE_MODULE_PATH "${MLIR_CMAKE_DIR}")
+  list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
 
-include(TableGen)
-include(AddLLVM)
-include(AddMLIR)
+  include(TableGen)
+  include(AddLLVM)
+  include(AddMLIR)
 
-include(HandleLLVMOptions)
+  include(HandleLLVMOptions)
 
-include_directories(${LLVM_INCLUDE_DIRS})
-include_directories(${MLIR_INCLUDE_DIRS})
+  include_directories(${LLVM_INCLUDE_DIRS})
+  include_directories(${MLIR_INCLUDE_DIRS})
 
-add_definitions(${LLVM_DEFINITIONS})
+  add_definitions(${LLVM_DEFINITIONS})
+endif()
 
 set(BUILD_SHARED_LIBS ${LLVM_ENABLE_SHARED_LIBS} CACHE BOOL "" FORCE)
 message(STATUS "BUILD_SHARED_LIBS        : " ${BUILD_SHARED_LIBS})
@@ -55,6 +61,7 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT LLVM_INSTALL_PREFIX)
 endif()
 message(STATUS "CMAKE_INSTALL_PREFIX     : " ${CMAKE_INSTALL_PREFIX})
 
+if (ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
 # The tablegen functions below are modeled based on the corresponding functions
 # in mlir: https://github.com/llvm/llvm-project/blob/main/mlir/cmake/modules/AddMLIR.cmake
 function(add_onnx_mlir_dialect_doc dialect dialect_tablegen_file)
@@ -126,6 +133,7 @@ function(add_onnx_mlir_interface interface)
   mlir_tablegen(${interface}.cpp.inc -gen-op-interface-defs)
   add_public_tablegen_target(OM${interface}IncGen)
 endfunction()
+endif()
 
 # add_onnx_mlir_library(name sources...
 #   This function (generally) has the same semantic as add_library. In
@@ -158,7 +166,9 @@ function(add_onnx_mlir_library name)
     )
 
   if (NOT ARG_EXCLUDE_FROM_OM_LIBS)
-    set_property(GLOBAL APPEND PROPERTY ONNX_MLIR_LIBS ${name})
+    if (NOT ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
+      set_property(GLOBAL APPEND PROPERTY ONNX_MLIR_LIBS ${name})
+    endif()
   endif()
 
   add_library(${name} ${ARG_UNPARSED_ARGUMENTS})

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if (ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
+  add_subdirectory(Runtime)
+  # Accelerators introduces a target AcceleratorsInc. Define a dummy one here
+  add_custom_target(AcceleratorsInc
+      COMMAND echo "This is the dummy definition for AcceleratorsInc"
+  ) 
+  add_compile_definitions(ENABLE_PYRUNTIME_LIT)
+  return()
+endif()
+
 add_subdirectory(Accelerators)
 add_subdirectory(Interface)
 add_subdirectory(Dialect)

diff --git a/src/Runtime/CMakeLists.txt b/src/Runtime/CMakeLists.txt
@@ -1,8 +1,10 @@
 
 # SPDX-License-Identifier: Apache-2.0
 
+if (NOT ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
 add_subdirectory(jni)
 add_subdirectory(omp)
+endif()
 add_subdirectory(python)
 
 # TODO: should add for each accelerator its subdirectory that implements InitAccel##name
@@ -65,6 +67,17 @@ set_target_properties(OMTensorUtils
   POSITION_INDEPENDENT_CODE TRUE
   )
 
+if (ONNX_MLIR_ENABLE_PYRUNTIME_LIT)
+add_compile_definitions(ENABLE_PYRUNTIME_LIT)
+add_onnx_mlir_library(OMExecutionSession
+  ExecutionSession.cpp
+
+  EXCLUDE_FROM_OM_LIBS
+
+  LINK_LIBS PUBLIC
+  OMTensorUtils
+  )
+else()
 add_onnx_mlir_library(OMExecutionSession
   ExecutionSession.cpp
 
@@ -74,6 +87,7 @@ add_onnx_mlir_library(OMExecutionSession
   OMTensorUtils
   LLVMSupport
   )
+endif()
 set_target_properties(OMExecutionSession
   PROPERTIES
   POSITION_INDEPENDENT_CODE TRUE

diff --git a/src/Runtime/ExecutionSession.cpp b/src/Runtime/ExecutionSession.cpp
@@ -16,14 +16,19 @@
 #include <errno.h>
 #include <string.h>
 
+
 #include <iostream>
 #include <memory>
 #include <sstream>
 #include <vector>
 
+#ifndef ENABLE_PYRUNTIME_LIT
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
+#else
+#include <dlfcn.h>
+#endif
 
 #include "ExecutionSession.hpp"
 #include "OMTensorListHelper.hpp"
@@ -44,16 +49,24 @@ void ExecutionSession::Init(
 
   // If there is no tag, use the model filename without extension as a tag.
   if (tag == "") {
+    // ToFix: equivalent implementation of llvm utilities.
+    // The would not be an urgent issue, because tag is usually "NONE"
+#ifndef ENABLE_PYRUNTIME_LIT
     std::string fname = llvm::sys::path::filename(sharedLibPath).str();
     llvm::SmallString<256> fnameWithoutExt(fname);
     llvm::sys::path::replace_extension(fnameWithoutExt, "");
     tag = fnameWithoutExt.str().lower();
+#endif
   }
 
   // tag = "NONE" to use functions without tag.
   std::string lowDashTag;
+  // ToFix: equivalent implementation of llv::StringRef
+#ifndef ENABLE_PYRUNTIME_LIT
+  // Assume tag is always NONE
   if (!llvm::StringRef(tag).equals_insensitive("NONE"))
     lowDashTag = "_" + tag;
+#endif
 
 #if defined(_WIN32)
   // Use functions without tags on Windows since we cannot define at compile
@@ -63,31 +76,55 @@ void ExecutionSession::Init(
 #endif
 
   // Init symbols used by execution session.
+#ifndef ENABLE_PYRUNTIME_LIT
   _sharedLibraryHandle =
       llvm::sys::DynamicLibrary::getLibrary(sharedLibPath.c_str());
   if (!_sharedLibraryHandle.isValid())
     throw std::runtime_error(reportLibraryOpeningError(sharedLibPath));
+#else
+  // Copy code from llvm/lib/Support/DynamicLibrary.cpp, especially the flags
+  // ToFix: copy the lock related code too. 
+  _sharedLibraryHandle = dlopen(sharedLibPath.c_str(), RTLD_LAZY | RTLD_GLOBAL);
+  if (!_sharedLibraryHandle)
+    throw std::runtime_error(reportLibraryOpeningError(sharedLibPath));
+#endif
 
   std::string queryEntryPointsNameWithTag = _queryEntryPointsName + lowDashTag;
+#ifndef ENABLE_PYRUNTIME_LIT
   _queryEntryPointsFunc = reinterpret_cast<queryEntryPointsFuncType>(
       _sharedLibraryHandle.getAddressOfSymbol(
           queryEntryPointsNameWithTag.c_str()));
+#else
+  _queryEntryPointsFunc = reinterpret_cast<queryEntryPointsFuncType>(
+     dlsym(_sharedLibraryHandle, queryEntryPointsNameWithTag.c_str()));
+#endif
+
   if (!_queryEntryPointsFunc)
     throw std::runtime_error(
         reportSymbolLoadingError(queryEntryPointsNameWithTag));
 
   std::string inputSignatureNameWithTag = _inputSignatureName + lowDashTag;
+#ifndef ENABLE_PYRUNTIME_LIT
   _inputSignatureFunc = reinterpret_cast<signatureFuncType>(
       _sharedLibraryHandle.getAddressOfSymbol(
           inputSignatureNameWithTag.c_str()));
+#else
+  _inputSignatureFunc = reinterpret_cast<signatureFuncType>(
+      dlsym(_sharedLibraryHandle, inputSignatureNameWithTag.c_str()));
+#endif
   if (!_inputSignatureFunc)
     throw std::runtime_error(
         reportSymbolLoadingError(inputSignatureNameWithTag));
 
   std::string outputSignatureNameWithTag = _outputSignatureName + lowDashTag;
+#ifndef ENABLE_PYRUNTIME_LIT
   _outputSignatureFunc = reinterpret_cast<signatureFuncType>(
       _sharedLibraryHandle.getAddressOfSymbol(
           outputSignatureNameWithTag.c_str()));
+#else
+  _outputSignatureFunc = reinterpret_cast<signatureFuncType>(
+      dlsym(_sharedLibraryHandle, outputSignatureNameWithTag.c_str()));
+#endif
   if (!_outputSignatureFunc)
     throw std::runtime_error(
         reportSymbolLoadingError(outputSignatureNameWithTag));
@@ -114,8 +151,13 @@ void ExecutionSession::Init(
 }
 
 ExecutionSession::~ExecutionSession() {
+#ifndef ENABLE_PYRUNTIME_LIT 
   if (_sharedLibraryHandle.isValid())
     llvm::sys::DynamicLibrary::closeLibrary(_sharedLibraryHandle);
+#else
+  if (!_sharedLibraryHandle)
+    dlclose(_sharedLibraryHandle);
+#endif
 }
 
 // =============================================================================
@@ -132,8 +174,13 @@ const std::string *ExecutionSession::queryEntryPoints(
 void ExecutionSession::setEntryPoint(const std::string &entryPointName) {
   if (!isInitialized)
     throw std::runtime_error(reportInitError());
+#ifndef ENABLE_PYRUNTIME_LIT 
   _entryPointFunc = reinterpret_cast<entryPointFuncType>(
       _sharedLibraryHandle.getAddressOfSymbol(entryPointName.c_str()));
+#else
+  _entryPointFunc = reinterpret_cast<entryPointFuncType>(
+      dlsym(_sharedLibraryHandle, entryPointName.c_str()));
+#endif
   if (!_entryPointFunc)
     throw std::runtime_error(reportSymbolLoadingError(entryPointName));
   _entryPointName = entryPointName;

diff --git a/src/Runtime/ExecutionSession.hpp b/src/Runtime/ExecutionSession.hpp
@@ -21,7 +21,12 @@
 #include <string>
 
 #include "OnnxMlirRuntime.h"
+#ifndef ENABLE_PYRUNTIME_LIT
 #include "llvm/Support/DynamicLibrary.h"
+typedef llvm::sys::DynamicLibrary DynamicLibraryHandleType;
+#else
+typedef void* DynamicLibraryHandleType;
+#endif
 
 namespace onnx_mlir {
 
@@ -62,7 +67,7 @@ class ExecutionSession {
   // defaultEntryPoint is false or there are multiple entry points in the model.
   void setEntryPoint(const std::string &entryPointName);
 
-  llvm::sys::DynamicLibrary &getSharedLibraryHandle() {
+  DynamicLibraryHandleType &getSharedLibraryHandle() {
     return _sharedLibraryHandle;
   };
 
@@ -100,7 +105,7 @@ class ExecutionSession {
   bool isInitialized = false;
 
   // Handler to the shared library file being loaded.
-  llvm::sys::DynamicLibrary _sharedLibraryHandle;
+  DynamicLibraryHandleType _sharedLibraryHandle;
 
   // Tag used to compile the model. By default, it is the model filename without
   // extension.