Revert "[Backend] Add KunlunXin XPU deploy support" (PaddlePaddle#893)

Revert "[Backend] Add KunlunXin XPU deploy support (PaddlePaddle#747)"

This reverts commit 5be839b.

CMakeLists.txt

@@ -40,7 +40,7 @@ if(NOT MSVC)
   add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
 endif(NOT MSVC)
 
-if(UNIX AND (NOT APPLE) AND (NOT ANDROID) AND (NOT WITH_TIMVX))
+if(UNIX AND (NOT APPLE) AND (NOT ANDROID) AND (NOT ENABLE_TIMVX))
   include(${PROJECT_SOURCE_DIR}/cmake/patchelf.cmake)
 endif()
 
@@ -64,8 +64,7 @@ option(ENABLE_LITE_BACKEND "Whether to enable paddle lite backend." OFF)
 option(ENABLE_VISION "Whether to enable vision models usage." OFF)
 option(ENABLE_TEXT "Whether to enable text models usage." OFF)
 option(ENABLE_FLYCV "Whether to enable flycv to boost image preprocess." OFF)
-option(WITH_TIMVX "Whether to compile for TIMVX deploy." OFF)
-option(WITH_XPU "Whether to compile for KunlunXin XPU deploy." OFF)
+option(ENABLE_TIMVX "Whether to compile for TIMVX deploy." OFF)
 option(WITH_TESTING "Whether to compile with unittest." OFF)
 ############################# Options for Android cross compiling #########################
 option(WITH_OPENCV_STATIC "Use OpenCV static lib for Android." OFF)
@@ -139,23 +138,10 @@ set(HEAD_DIR "${PROJECT_SOURCE_DIR}/${CSRCS_DIR_NAME}")
 include_directories(${HEAD_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-if (WITH_TIMVX)
+if (ENABLE_TIMVX)
   include(${PROJECT_SOURCE_DIR}/cmake/timvx.cmake)
 endif()
 
-if (WITH_XPU)
-  if(NOT ENABLE_LITE_BACKEND)
-      message(WARNING "While compiling with -DWITH_XPU=ON, will force to set -DENABLE_LITE_BACKEND=ON")
-      set(ENABLE_LITE_BACKEND ON)
-  endif()
-  if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64")
-    message(FATAL_ERROR "XPU is only supported on Linux x64 platform")
-  endif()
-  if(NOT PADDLELITE_URL)
-    set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/third_libs/lite-linux-x64-xpu-20221215.tgz")
-  endif()
-endif()
-
 
 if(ANDROID OR IOS)
   if(ENABLE_ORT_BACKEND)

FastDeploy.cmake.in

@@ -27,7 +27,6 @@ set(OPENCV_DIRECTORY "@OPENCV_DIRECTORY@")
 set(ORT_DIRECTORY "@ORT_DIRECTORY@")
 set(OPENVINO_DIRECTORY "@OPENVINO_DIRECTORY@")
 set(RKNN2_TARGET_SOC "@RKNN2_TARGET_SOC@")
-set(WITH_XPU @WITH_XPU@)
 
 set(FASTDEPLOY_LIBS "")
 set(FASTDEPLOY_INCS "")
@@ -238,10 +237,6 @@ if(ENABLE_PADDLE_FRONTEND)
   list(APPEND FASTDEPLOY_LIBS ${PADDLE2ONNX_LIB})
 endif()
 
-if(WITH_XPU)
-  list(APPEND FASTDEPLOY_LIBS -lpthread -lrt -ldl)
-endif()
-
 remove_duplicate_libraries(FASTDEPLOY_LIBS)
 
 # Print compiler information

cmake/summary.cmake

@@ -37,8 +37,6 @@ function(fastdeploy_summary)
   message(STATUS "  ENABLE_POROS_BACKEND      : ${ENABLE_POROS_BACKEND}")
   message(STATUS "  ENABLE_TRT_BACKEND        : ${ENABLE_TRT_BACKEND}")
   message(STATUS "  ENABLE_OPENVINO_BACKEND   : ${ENABLE_OPENVINO_BACKEND}")
-  message(STATUS "  WITH_TIMVX                : ${WITH_TIMVX}")
-  message(STATUS "  WITH_XPU                  : ${WITH_XPU}")
   if(ENABLE_ORT_BACKEND)
     message(STATUS "  ONNXRuntime version       : ${ONNXRUNTIME_VERSION}")
   endif()

docs/README_CN.md

@@ -8,7 +8,6 @@
 - [GPU部署环境编译安装](cn/build_and_install/gpu.md)
 - [CPU部署环境编译安装](cn/build_and_install/cpu.md)
 - [IPU部署环境编译安装](cn/build_and_install/ipu.md)
-- [昆仑芯XPU部署环境编译安装](cn/build_and_install/xpu.md)
 - [Jetson部署环境编译安装](cn/build_and_install/jetson.md)
 - [Android平台部署环境编译安装](cn/build_and_install/android.md)
 - [服务化部署镜像编译安装](../serving/docs/zh_CN/compile.md)

docs/README_EN.md

@@ -8,7 +8,6 @@
 - [Build and Install FastDeploy Library on GPU Platform](en/build_and_install/gpu.md)
 - [Build and Install FastDeploy Library on CPU Platform](en/build_and_install/cpu.md)
 - [Build and Install FastDeploy Library on IPU Platform](en/build_and_install/ipu.md)
-- [Build and Install FastDeploy Library on KunlunXin XPU Platform](en/build_and_install/xpu.md)
 - [Build and Install FastDeploy Library on  Nvidia Jetson Platform](en/build_and_install/jetson.md)
 - [Build and Install FastDeploy Library on Android Platform](en/build_and_install/android.md)
 - [Build and Install FastDeploy Serving Deployment Image](../serving/docs/EN/compile-en.md)
@@ -20,10 +19,10 @@
 - [A Quick Start on Runtime Python](en/quick_start/runtime/python.md)
 - [A Quick Start on Runtime C++](en/quick_start/runtime/cpp.md)
 
-## API
+## API 
 
 - [Python API](https://baidu-paddle.github.io/fastdeploy-api/python/html/)
-- [C++ API](https://baidu-paddle.github.io/fastdeploy-api/cpp/html/)
+- [C++ API](https://baidu-paddle.github.io/fastdeploy-api/cpp/html/) 
 - [Android Java API](../java/android)
 
 ## Performance Optimization

docs/cn/build_and_install/README.md

@@ -13,19 +13,17 @@
 - [Android平台部署环境](android.md)
 - [瑞芯微RV1126部署环境](rv1126.md)
 - [晶晨A311D部署环境](a311d.md)
-- [昆仑芯XPU部署环境](xpu.md)
 
 
 ## FastDeploy编译选项说明
 
 | 选项                      | 说明                                                                        |
 |:------------------------|:--------------------------------------------------------------------------|
 | ENABLE_ORT_BACKEND      | 默认OFF, 是否编译集成ONNX Runtime后端(CPU/GPU上推荐打开)                                 |
-| ENABLE_PADDLE_BACKEND   | 默认OFF，是否编译集成Paddle Inference后端(CPU/GPU上推荐打开)                             |  
-| ENABLE_LITE_BACKEND     | 默认OFF，是否编译集成Paddle Lite后端(编译Android库时需要设置为ON)                          |
+| ENABLE_PADDLE_BACKEND   | 默认OFF，是否编译集成Paddle Inference后端(CPU/GPU上推荐打开)                              |  
+| ENABLE_LITE_BACKEND     | 默认OFF，是否编译集成Paddle Lite后端(编译Android库时需要设置为ON)                             |
 | ENABLE_RKNPU2_BACKEND   | 默认OFF，是否编译集成RKNPU2后端(RK3588/RK3568/RK3566上推荐打开)                           |
-| WITH_XPU                | 默认OFF，当在昆仑芯XPU上部署时，需设置为ON                                                |
-| WITH_TIMVX              | 默认OFF，需要在RV1126/RV1109/A311D上部署时，需设置为ON                                   |
+| WITH_TIMVX            | 默认OFF，需要在RV1126/RV1109/A311D上部署时，需设置为ON                                   |
 | ENABLE_TRT_BACKEND      | 默认OFF，是否编译集成TensorRT后端(GPU上推荐打开)                                          |
 | ENABLE_OPENVINO_BACKEND | 默认OFF，是否编译集成OpenVINO后端(CPU上推荐打开)                                          |
 | ENABLE_VISION           | 默认OFF，是否编译集成视觉模型的部署模块                                                     |

docs/cn/build_and_install/a311d.md

@@ -9,8 +9,7 @@ FastDeploy 基于 Paddle-Lite 后端支持在晶晨 NPU 上进行部署推理。
 |编译选项|默认值|说明|备注|  
 |:---|:---|:---|:---|  
 |ENABLE_LITE_BACKEND|OFF|编译A311D部署库时需要设置为ON| - |
-|WITH_TIMVX|OFF|编译A311D部署库时需要设置为ON| - |  
-|TARGET_ABI|NONE|编译RK库时需要设置为arm64| - |
+|WITH_TIMVX|OFF|编译A311D部署库时需要设置为ON| - |
 
 更多编译选项请参考[FastDeploy编译选项说明](./README.md)
 

docs/cn/build_and_install/rv1126.md

@@ -8,9 +8,8 @@ FastDeploy基于 Paddle-Lite 后端支持在瑞芯微（Rockchip）Soc 上进行
 相关编译选项说明如下：  
 |编译选项|默认值|说明|备注|  
 |:---|:---|:---|:---|  
-|ENABLE_LITE_BACKEND|OFF|编译RK库时需要设置为ON| - |  
-|WITH_TIMVX|OFF|编译RK库时需要设置为ON| - |  
-|TARGET_ABI|NONE|编译RK库时需要设置为armhf| - |
+|ENABLE_LITE_BACKEND|OFF|编译RK库时需要设置为ON| - |
+|WITH_TIMVX|OFF|编译RK库时需要设置为ON| - |
 
 更多编译选项请参考[FastDeploy编译选项说明](./README.md)
 
@@ -87,7 +86,7 @@ dmesg | grep Galcore
 wget https://paddlelite-demo.bj.bcebos.com/devices/generic/PaddleLite-generic-demo.tar.gz
 tar -xf PaddleLite-generic-demo.tar.gz
 ```
-2. 使用 `uname -a` 查看 `Linux Kernel` 版本，确定为 `Linux` 系统 4.19.111 版本
+2. 使用 `uname -a` 查看 `Linux Kernel` 版本，确定为 `Linux` 系统 4.19.111 版本，
 3. 将 `PaddleLite-generic-demo/libs/PaddleLite/linux/armhf/lib/verisilicon_timvx/viv_sdk_6_4_6_5/lib/1126/4.19.111/` 路径下的 `galcore.ko` 上传至开发板。
 
 4. 登录开发板，命令行输入 `sudo rmmod galcore` 来卸载原始驱动，输入 `sudo insmod galcore.ko` 来加载传上设备的驱动。（是否需要 sudo 根据开发板实际情况，部分 adb 链接的设备请提前 adb root）。此步骤如果操作失败，请跳转至方法 2。

docs/en/build_and_install/README.md

@@ -12,9 +12,6 @@ English | [中文](../../cn/build_and_install/README.md)
 - [Build and Install on IPU Platform](ipu.md)
 - [Build and Install on Nvidia Jetson Platform](jetson.md)
 - [Build and Install on Android Platform](android.md)
-- [Build and Install on RV1126 Platform](rv1126.md)
-- [Build and Install on A311D Platform](a311d.md)
-- [Build and Install on KunlunXin XPU Platform](xpu.md)
 
 
 ## Build options
@@ -28,8 +25,6 @@ English | [中文](../../cn/build_and_install/README.md)
 | ENABLE_VISION | Default OFF，whether to enable vision models deployment module |
 | ENABLE_TEXT | Default OFF，whether to enable text models deployment module |
 | WITH_GPU | Default OFF, if build on GPU, this need to be ON |
-| WITH_XPU | Default OFF，if deploy on KunlunXin XPU，this need to be ON |
-| WITH_TIMVX | Default OFF，if deploy on RV1126/RV1109/A311D，this need to be ON |
 | CUDA_DIRECTORY | Default /usr/local/cuda, if build on GPU, this defines the path of CUDA(>=11.2) |
 | TRT_DIRECTORY | If build with ENABLE_TRT_BACKEND=ON, this defines the path of TensorRT(>=8.4) |
 | ORT_DIRECTORY | [Optional] If build with ENABLE_ORT_BACKEND=ON, this flag defines the path of ONNX Runtime, but if this flag is not set, it will download ONNX Runtime library automatically |