Rollback on openvino changes

Author: BujSet

CMakeLists.txt

@@ -725,10 +725,6 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)
     list(APPEND _executor_runner_libs xnnpack_backend)
   endif()
 
-  if(EXECUTORCH_BUILD_OPENVINO)
-    list(APPEND _executor_runner_libs openvino_backend)
-  endif()
-
   if(EXECUTORCH_ENABLE_EVENT_TRACER)
     list(APPEND _executor_runner_libs etdump flatccrt)
   endif()

backends/openvino/CMakeLists.txt

@@ -48,5 +48,28 @@ target_sources(openvino_backend PRIVATE ${CMAKE_CURRENT_LIST_DIR}/runtime/Openvi
 
 target_link_options_shared_lib(openvino_backend)
 
+if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER)
+    # Build executor runner binary for openvino backend
+    list(APPEND openvino_executor_runner_libs openvino_backend executorch)
+
+    set(_openvino_executor_runner__srcs
+        ${EXECUTORCH_ROOT}/examples/portable/executor_runner/executor_runner.cpp
+        ${EXECUTORCH_ROOT}/extension/data_loader/file_data_loader.cpp
+        ${EXECUTORCH_ROOT}/extension/evalue_util/print_evalue.cpp
+        ${EXECUTORCH_ROOT}/extension/runner_util/inputs.cpp
+        ${EXECUTORCH_ROOT}/extension/runner_util/inputs_portable.cpp
+        )
+    add_executable(openvino_executor_runner ${_openvino_executor_runner__srcs})
+
+    list(APPEND openvino_executor_runner_libs)
+
+    target_link_libraries(
+      openvino_executor_runner gflags portable_ops_lib ${openvino_executor_runner_libs}
+    )
+    target_compile_options(openvino_executor_runner PUBLIC ${_common_compile_options})
+endif()
+
+
+
 # Install OpenVINO backend library to the lib directory
 install(TARGETS openvino_backend DESTINATION lib)

backends/openvino/scripts/openvino_build.sh

@@ -30,7 +30,7 @@ main() {
               -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
               -DEXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL=ON \
               -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
-              -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=ON \
+              -DEXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER=ON \
               -B"${build_dir}"