[Bug Fix] fix build xpu encrypt & auth image scripts (#2133)

* [patchelf] fix patchelf error for inference xpu * [serving] add xpu dockerfile and support fd server * [serving] add xpu dockerfile and support fd server * [Serving] support XPU + Tritron * [Serving] support XPU + Tritron * [Dockerfile] update xpu tritron docker file -> paddle 0.0.0 * [Dockerfile] update xpu tritron docker file -> paddle 0.0.0 * [Dockerfile] update xpu tritron docker file -> paddle 0.0.0 * [Dockerfile] add comments for xpu tritron dockerfile * [Doruntime] fix xpu infer error * [Doruntime] fix xpu infer error * [XPU] update xpu dockerfile * add xpu triton server docs * add xpu triton server docs * add xpu triton server docs * add xpu triton server docs * update xpu triton server docs * update xpu triton server docs * update xpu triton server docs * update xpu triton server docs * update xpu triton server docs * update xpu triton server docs * update xpu triton server docs * update xpu triton server docs * [XPU] Update XPU L3 Cache setting docs * [XPU] Add Encryption and AUTH support for XPU Server * [XPU] Add Encryption and AUTH support for XPU Server * [Bug Fix] fix paddle reader error * [Serving] Support XPU encrypt & auth server * [Serving] Support XPU encrypt & auth server * [Serving] Support XPU encrypt & auth server * [Serving] Support XPU encrypt & auth server * [Triton] switch TAG 22.12 -> TAG 21.10wq * update xpu auth server script * [Bug Fix] fix build xpu encrypt & auth image scripts
PaddlePaddle · Jul 24, 2023 · 12bb44e · 12bb44e
1 parent ade27d2
commit 12bb44e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 45 deletions.
diff --git a/cmake/paddle_inference.cmake b/cmake/paddle_inference.cmake
@@ -268,10 +268,12 @@ function(set_paddle_encrypt_auth_compatible_policy LIBRARY_NAME)
 endfunction()
 
 # Compatible policy for 2.4.x/2.5.x and latest dev.
-string(REGEX MATCH "0.0.0" PADDLEINFERENCE_USE_DEV ${PADDLEINFERENCE_VERSION})
-string(REGEX MATCH "2.4|post24|post2.4" PADDLEINFERENCE_USE_2_4_x ${PADDLEINFERENCE_VERSION})
-string(REGEX MATCH "2.5|post25|post2.5" PADDLEINFERENCE_USE_2_5_x ${PADDLEINFERENCE_VERSION})
-
+if (NOT WITH_KUNLUNXIN)
+  string(REGEX MATCH "0.0.0" PADDLEINFERENCE_USE_DEV ${PADDLEINFERENCE_VERSION})
+  string(REGEX MATCH "2.4|post24|post2.4" PADDLEINFERENCE_USE_2_4_x ${PADDLEINFERENCE_VERSION})
+  string(REGEX MATCH "2.5|post25|post2.5" PADDLEINFERENCE_USE_2_5_x ${PADDLEINFERENCE_VERSION})
+endif()
+
 if(PADDLEINFERENCE_USE_DEV)
   set(PADDLEINFERENCE_API_COMPAT_DEV ON CACHE BOOL "" FORCE)
 endif()
@@ -298,7 +300,7 @@ if(PADDLEINFERENCE_API_COMPAT_DEV)
 endif()
 
 # Compatible policy for custom paddle ops
-if(PADDLEINFERENCE_API_COMPAT_2_5_x)
+if(PADDLEINFERENCE_API_COMPAT_2_5_x AND (NOT WITH_KUNLUNXIN))
   # no c++ standard policy conflicts vs c++ 11
   # TODO: support custom ops for latest dev
   set(PADDLEINFERENCE_API_CUSTOM_OP ON CACHE BOOL "" FORCE)
@@ -310,7 +312,7 @@ if(PADDLEINFERENCE_API_COMPAT_2_5_x)
 endif()
 
 function(set_paddle_custom_ops_compatible_policy)
-  if(PADDLEINFERENCE_API_CUSTOM_OP)
+  if(PADDLEINFERENCE_API_CUSTOM_OP AND (NOT WITH_KUNLUNXIN))
     if(NOT MSVC)
       # TODO: add non c++ 14 policy for latest dev
       if(NOT PADDLEINFERENCE_API_COMPAT_2_5_x)

diff --git a/examples/vision/classification/paddleclas/serving/models/preprocess/1/inference_cls.yaml b/examples/vision/classification/paddleclas/serving/models/preprocess/1/inference_cls.yaml
diff --git a/serving/scripts/build_fd_xpu.sh b/serving/scripts/build_fd_xpu.sh
@@ -16,7 +16,7 @@
 
 echo "start build FD XPU library"
 
-docker run -i --rm --name build_fd_xpu \
+docker run -i --rm --name build_fd_xpu_108 \
            -v `pwd`/..:/workspace/fastdeploy \
            -e "http_proxy=${http_proxy}" \
            -e "https_proxy=${https_proxy}" \

diff --git a/serving/scripts/build_fd_xpu_encrypt_auth.sh b/serving/scripts/build_fd_xpu_encrypt_auth.sh
@@ -16,7 +16,7 @@
 
 echo "start build FD XPU AUTH library"
 
-docker run -i --rm --name build_fd_xpu_auth_dev \
+docker run -i --rm --name build_fd_xpu_auth_108_dev \
            -v `pwd`/..:/workspace/fastdeploy \
            -e "http_proxy=${http_proxy}" \
            -e "https_proxy=${https_proxy}" \
@@ -41,8 +41,9 @@ docker run -i --rm --name build_fd_xpu_auth_dev \
             python setup.py build;
             python setup.py bdist_wheel;
             cd /workspace/fastdeploy;
-            wget ${PADDLEINFERENCE_URL} && tar -zxvf ${PADDLEINFERENCE_URL##*/}
-            mv ${PADDLEINFERENCE_URL##*/} paddle_inference
+            wget -q ${PADDLEINFERENCE_URL} && tar -zxvf ${PADDLEINFERENCE_URL##*/};
+            tmp_dir=${PADDLEINFERENCE_URL##*/}
+            mv ${tmp_dir%.*} paddle_inference
             PADDLEINFERENCE_DIRECTORY=${PWD}/paddle_inference
             rm -rf build; mkdir build; cd build;
             cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PWD}/fastdeploy_install -DWITH_KUNLUNXIN=ON -DENABLE_PADDLE_BACKEND=ON -DPADDLEINFERENCE_DIRECTORY=${PADDLEINFERENCE_DIRECTORY} -DENABLE_BENCHMARK=ON -DLIBRARY_NAME=fastdeploy_runtime;