PaddlePaddle
diff --git a/‎.gitmodules
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎.gitmodules
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎CMakeLists.txt
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎CMakeLists.txt
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎cmake/external/openvino.cmake
Copy file name to clipboard
+151Lines changed: 151 additions & 0 deletions b/‎cmake/external/openvino.cmake
Copy file name to clipboard
+151Lines changed: 151 additions & 0 deletions
diff --git a/‎cmake/inference_lib.cmake
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions b/‎cmake/inference_lib.cmake
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
diff --git a/‎cmake/third_party.cmake
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎cmake/third_party.cmake
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎cmake/version.cmake
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎cmake/version.cmake
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/fluid/framework/CMakeLists.txt
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎paddle/fluid/framework/CMakeLists.txt
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎paddle/fluid/framework/naive_executor.cc
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎paddle/fluid/framework/naive_executor.cc
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎paddle/fluid/inference/CMakeLists.txt
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎paddle/fluid/inference/CMakeLists.txt
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎paddle/fluid/inference/analysis/argument.h
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion b/‎paddle/fluid/inference/analysis/argument.h
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion
@@ -125,3 +125,7 @@
 [submodule "third_party/yaml-cpp"]
 	path = third_party/yaml-cpp
 	url = https://github.com/jbeder/yaml-cpp
+[submodule "third_party/openvino"]
+	path = third_party/openvino
+	url = https://github.com/openvinotoolkit/openvino.git
+	ignore = dirty
@@ -50,6 +50,7 @@ option(WITH_ONEMKL "Compile PaddlePaddle with oneMKL" OFF)
 option(WITH_GPU "Compile PaddlePaddle with NVIDIA GPU" ${CUDA_FOUND})
 option(WITH_MPI "Compile PaddlePaddle with MPI" OFF)
 option(WITH_TENSORRT "Compile PaddlePaddle with NVIDIA TensorRT" OFF)
+option(WITH_OPENVINO "Compile PaddlePaddle with Intel OpenVINO" OFF)
 option(WITH_XPU "Compile PaddlePaddle with BAIDU KUNLUN XPU" OFF)
 option(WITH_XPU_KP "Compile PaddlePaddle with BAIDU XPU compiler " OFF)
 option(WITH_XPU_XFT "Compile PaddlePaddle with BAIDU XPU-XFT" OFF)
 
@@ -0,0 +1,151 @@
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if(NOT LINUX)
+  message(STATUS "OpenVINO only support Linux.")
+  set(WITH_OPENVINO OFF)
+  return()
+endif()
+
+include(ExternalProject)
+
+set(OPENVINO_PROJECT "extern_openvino")
+set(OPENVINO_PREFIX_DIR ${THIRD_PARTY_PATH}/openvino)
+set(OPENVINO_INSTALL_DIR ${THIRD_PARTY_PATH}/install/openvino)
+set(OPENVINO_INC_DIR
+    "${OPENVINO_INSTALL_DIR}/runtime/include"
+    CACHE PATH "OpenVINO include directory." FORCE)
+set(SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/openvino)
+
+set(TBB_INC_DIR
+    "${OPENVINO_INSTALL_DIR}/runtime/3rdparty/tbb/include"
+    CACHE PATH "OpenVINO TBB include directory." FORCE)
+
+# Introduce variables:
+# * CMAKE_INSTALL_LIBDIR
+include(GNUInstallDirs)
+string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} ARCH)
+if(ARCH STREQUAL "x86_64"
+   OR ARCH STREQUAL "amd64"
+   OR CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
+  set(ARCH intel64)
+elseif(ARCH STREQUAL "i386")
+  set(ARCH ia32)
+endif()
+set(LIBDIR "runtime/lib/${ARCH}")
+set(TBBDIR "runtime/3rdparty/tbb/lib")
+
+set(OPENVINO_LIB_NAME
+    "libopenvino.so.2500"
+    CACHE PATH "libopenvino name." FORCE)
+set(OPENVINO_PADDLE_LIB_NAME
+    "libopenvino_paddle_frontend.so.2500"
+    CACHE PATH "libopenvino_paddle_frontend name." FORCE)
+set(OPENVINO_CPU_PLUGIN_LIB_NAME
+    "libopenvino_intel_cpu_plugin.so"
+    CACHE PATH "libopenvino_intel_cpu_plugin name." FORCE)
+set(TBB_LIB_NAME
+    "libtbb.so.12"
+    CACHE PATH "libtbb name." FORCE)
+
+message(STATUS "Set ${OPENVINO_INSTALL_DIR}/${LIBDIR} to runtime path")
+message(STATUS "Set ${OPENVINO_INSTALL_DIR}/${TBBDIR} to runtime path")
+set(OPENVINO_LIB_DIR ${OPENVINO_INSTALL_DIR}/${LIBDIR})
+set(TBB_LIB_DIR ${OPENVINO_INSTALL_DIR}/${TBBDIR})
+
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${OPENVINO_LIB_DIR}"
+                        "${TBB_LIB_DIR}")
+
+include_directories(${OPENVINO_INC_DIR}
+)# For OpenVINO code to include internal headers.
+
+include_directories(${TBB_INC_DIR}
+)# For OpenVINO TBB code to include third_party headers.
+
+if(LINUX)
+  set(OPENVINO_LIB
+      "${OPENVINO_INSTALL_DIR}/${LIBDIR}/${OPENVINO_LIB_NAME}"
+      CACHE FILEPATH "OpenVINO library." FORCE)
+  set(OPENVINO_PADDLE_LIB
+      "${OPENVINO_INSTALL_DIR}/${LIBDIR}/${OPENVINO_PADDLE_LIB_NAME}"
+      CACHE FILEPATH "OpenVINO paddle frontend library." FORCE)
+  set(OPENVINO_CPU_PLUGIN_LIB
+      "${OPENVINO_INSTALL_DIR}/${LIBDIR}/${OPENVINO_CPU_PLUGIN_LIB_NAME}"
+      CACHE FILEPATH "OpenVINO cpu inference library." FORCE)
+  set(TBB_LIB
+      "${OPENVINO_INSTALL_DIR}/${TBBDIR}/${TBB_LIB_NAME}"
+      CACHE FILEPATH "TBB library." FORCE)
+else()
+  message(ERROR "Only support Linux.")
+endif()
+
+if(LINUX)
+  set(BUILD_BYPRODUCTS_ARGS ${OPENVINO_LIB} ${TBB_LIB} ${OPENVINO_PADDLE_LIB}
+                            ${OPENVINO_CPU_PLUGIN_LIB})
+else()
+  set(BUILD_BYPRODUCTS_ARGS "")
+endif()
+
+set(OPENVINO_COMMIT 07ecdf07d2974410dc1d67d9fa2d3433dcab7865)
+file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/openvino/convert.patch
+     native_convert)
+
+set(OPENVINO_PATCH_COMMAND
+    git checkout -- . && git checkout ${OPENVINO_COMMIT} && patch -Np1 -d
+    ${SOURCE_DIR} < ${native_convert} || true)
+
+ExternalProject_Add(
+  ${OPENVINO_PROJECT}
+  ${EXTERNAL_PROJECT_LOG_ARGS}
+  SOURCE_DIR ${SOURCE_DIR}
+  DEPENDS ${OPENVINO_DEPENDS}
+  PREFIX ${OPENVINO_PREFIX_DIR}
+  UPDATE_COMMAND ""
+  #BUILD_ALWAYS        1
+  PATCH_COMMAND ${OPENVINO_PATCH_COMMAND}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${OPENVINO_INSTALL_DIR}
+             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+             -DTHREADING=TBB
+             -DENABLE_INTEL_CPU=ON
+             -DENABLE_INTEL_GPU=OFF
+             -DENABLE_OV_JAX_FRONTEND=OFF
+             -DENABLE_OV_ONNX_FRONTEND=OFF
+             -DENABLE_OV_PYTORCH_FRONTEND=OFF
+             -DENABLE_OV_TF_FRONTEND=OFF
+             -DENABLE_OV_TF_LITE_FRONTEND=OFF
+             -DENABLE_INTEL_NPU=OFF
+  CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${OPENVINO_INSTALL_DIR}
+  BUILD_BYPRODUCTS ${BUILD_BYPRODUCTS_ARGS})
+
+message(STATUS "OpenVINO library: ${OPENVINO_LIB}")
+message(STATUS "OpenVINO Paddle library: ${OPENVINO_PADDLE_LIB}")
+message(STATUS "OpenVINO CPU Inference library: ${OPENVINO_CPU_PLUGIN_LIB}")
+message(STATUS "OpenVINO TBB library: ${TBB_LIB}")
+add_definitions(-DPADDLE_WITH_OPENVINO)
+
+add_library(openvino SHARED IMPORTED GLOBAL)
+add_library(openvino_paddle SHARED IMPORTED GLOBAL)
+add_library(openvino_cpu_plugin SHARED IMPORTED GLOBAL)
+add_library(tbb SHARED IMPORTED GLOBAL)
+set_property(TARGET openvino PROPERTY IMPORTED_LOCATION ${OPENVINO_LIB})
+set_property(TARGET openvino_paddle PROPERTY IMPORTED_LOCATION
+                                             ${OPENVINO_PADDLE_LIB})
+set_property(TARGET openvino_cpu_plugin PROPERTY IMPORTED_LOCATION
+                                                 ${OPENVINO_CPU_PLUGIN_LIB})
+set_property(TARGET tbb PROPERTY IMPORTED_LOCATION ${TBB_LIB})
+add_dependencies(openvino ${OPENVINO_PROJECT})
+add_dependencies(openvino_paddle ${OPENVINO_PROJECT})
+add_dependencies(openvino_cpu_plugin ${OPENVINO_PROJECT})
+add_dependencies(tbb ${OPENVINO_PROJECT})
@@ -150,6 +150,20 @@ function(copy_part_of_third_party TARGET DST)
       DSTS ${dst_dir}/include ${dst_dir})
   endif()
 
+  if(WITH_OPENVINO)
+    set(dst_dir "${DST}/third_party/install/openvino")
+    copy(
+      ${TARGET}
+      SRCS ${OPENVINO_INC_DIR} ${OPENVINO_LIB_DIR}
+      DSTS ${dst_dir} ${dst_dir})
+
+    set(dst_dir "${DST}/third_party/install/tbb")
+    copy(
+      ${TARGET}
+      SRCS ${TBB_INC_DIR} ${TBB_LIB_DIR}
+      DSTS ${dst_dir} ${dst_dir})
+  endif()
+
   set(dst_dir "${DST}/third_party/install/gflags")
   copy(
     ${TARGET}
 
@@ -638,4 +638,9 @@ if(WITH_CUDNN_FRONTEND)
   list(APPEND third_party_deps extern_cudnn_frontend)
 endif()
 
+if(WITH_OPENVINO)
+  include(external/openvino)
+  list(APPEND third_party_deps extern_openvino)
+endif()
+
 add_custom_target(third_party ALL DEPENDS ${third_party_deps})
@@ -97,6 +97,7 @@ function(version version_file)
     "GIT COMMIT ID: ${PADDLE_GIT_COMMIT}\n"
     "WITH_MKL: ${WITH_MKL}\n"
     "WITH_ONEDNN: ${WITH_ONEDNN}\n"
+    "WITH_OPENVINO: ${WITH_OPENVINO}\n"
     "WITH_GPU: ${WITH_GPU}\n"
     "WITH_ROCM: ${WITH_ROCM}\n"
     "WITH_IPU: ${WITH_IPU}\n")
 
@@ -494,6 +494,10 @@ if(TENSORRT_FOUND)
   set(NAIVE_EXECUTOR_DEPS ${NAIVE_EXECUTOR_DEPS} tensorrt_engine_op)
 endif()
 
+if(WITH_OPENVINO)
+  set(NAIVE_EXECUTOR_DEPS ${NAIVE_EXECUTOR_DEPS} openvino_engine_op)
+endif()
+
 cc_library(
   naive_executor
   SRCS naive_executor.cc
 
@@ -29,6 +29,10 @@
 #ifdef PADDLE_WITH_TENSORRT
 #include "paddle/fluid/operators/tensorrt/tensorrt_engine_op.h"
 #endif
+#ifdef PADDLE_WITH_OPENVINO
+#include "paddle/fluid/operators/openvino/openvino_engine_op.h"
+#endif
+
 #ifdef PADDLE_WITH_NVTX
 #include "paddle/phi/core/platform/device/gpu/cuda/cuda_profiler.h"
 #endif
 
@@ -26,6 +26,10 @@ if(TENSORRT_FOUND)
   add_subdirectory(tensorrt)
 endif()
 
+if(WITH_OPENVINO)
+  add_subdirectory(openvino)
+endif()
+
 # fluid_modules exclude API-interface of inference/api and inference/capi_exp
 get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES)
 get_property(phi_modules GLOBAL PROPERTY PHI_MODULES)
 
@@ -301,7 +301,12 @@ struct Argument {
   DECL_ARGUMENT_FIELD(tensorrt_ops_run_float,
                       TensorRtOpsRunFloat,
                       std::unordered_set<std::string>);
-
+#ifdef PADDLE_WITH_OPENVINO
+  DECL_ARGUMENT_FIELD(use_openvino, UseOpenVINO, bool);
+  DECL_ARGUMENT_FIELD(openvino_inference_precision,
+                      OpenvinoInferencePrecision,
+                      int);
+#endif
   DECL_ARGUMENT_FIELD(use_xpu, UseXpu, bool);
   DECL_ARGUMENT_FIELD(xpu_locked, XpuLocked, bool);
   DECL_ARGUMENT_FIELD(xpu_precision, XpuPrecision, std::string);