From 4523d4246dbd2384361e7b1151e0455f8fb2419d Mon Sep 17 00:00:00 2001
From: Tingquan Gao <gaotingquan@baidu.com>
Date: Tue, 6 Apr 2021 10:52:40 +0800
Subject: [PATCH] Adapt paddle_inference 2.0.1 API (#667)

---
 deploy/cpp_infer/CMakeLists.txt | 8 ++++----
 tools/infer/predict.py          | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/deploy/cpp_infer/CMakeLists.txt b/deploy/cpp_infer/CMakeLists.txt
index 57fadb2a..4f148869 100755
--- a/deploy/cpp_infer/CMakeLists.txt
+++ b/deploy/cpp_infer/CMakeLists.txt
@@ -135,18 +135,18 @@ endif()
 if(WITH_STATIC_LIB)
   if(WIN32)
     set(DEPS
-        ${PADDLE_LIB}/paddle/lib/paddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
+        ${PADDLE_LIB}/paddle/lib/paddle_inference${CMAKE_STATIC_LIBRARY_SUFFIX})
   else()
     set(DEPS
-        ${PADDLE_LIB}/paddle/lib/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
+        ${PADDLE_LIB}/paddle/lib/libpaddle_inference${CMAKE_STATIC_LIBRARY_SUFFIX})
   endif()
 else()
   if(WIN32)
     set(DEPS
-        ${PADDLE_LIB}/paddle/lib/paddle_fluid${CMAKE_SHARED_LIBRARY_SUFFIX})
+        ${PADDLE_LIB}/paddle/lib/paddle_inference${CMAKE_SHARED_LIBRARY_SUFFIX})
   else()
     set(DEPS
-        ${PADDLE_LIB}/paddle/lib/libpaddle_fluid${CMAKE_SHARED_LIBRARY_SUFFIX})
+        ${PADDLE_LIB}/paddle/lib/libpaddle_inference${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
 endif(WITH_STATIC_LIB)
 
diff --git a/tools/infer/predict.py b/tools/infer/predict.py
index 6c4b55ff..de624bcb 100644
--- a/tools/infer/predict.py
+++ b/tools/infer/predict.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
 import numpy as np
 import cv2
 import time
@@ -101,6 +102,13 @@ class Predictor(object):
 
 if __name__ == "__main__":
     args = parse_args()
+    assert os.path.exists(
+        args.model_file), "The path of 'model_file' does not exist: {}".format(
+            args.model_file)
+    assert os.path.exists(
+        args.params_file
+    ), "The path of 'params_file' does not exist: {}".format(args.params_file)
+
     predictor = Predictor(args)
     if not args.enable_benchmark:
         predictor.normal_predict()
-- 
GitLab