From f678d788058288bfe59722b05a850e25924f7ed4 Mon Sep 17 00:00:00 2001
From: felixhjh <852142024@qq.com>
Date: Wed, 29 Dec 2021 07:34:13 +0000
Subject: [PATCH] when paddle is not installed, stop env check process  to info
 user to intall paddle

---
 python/paddle_serving_server/env_check/run.py             | 1 +
 python/paddle_serving_server/env_check/test_fit_a_line.py | 8 +++++---
 .../paddle_serving_server/env_check/test_uci_pipeline.py  | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/python/paddle_serving_server/env_check/run.py b/python/paddle_serving_server/env_check/run.py
index df5a7d23..6b295554 100644
--- a/python/paddle_serving_server/env_check/run.py
+++ b/python/paddle_serving_server/env_check/run.py
@@ -47,6 +47,7 @@ def run_test_cases(cases_list, case_type):
         elif res == 1:
             if case_name == "inference":
                 print("{} {} environment running failure. Please refer to https://www.paddlepaddle.org.cn/install/quick?docurl=/documentation/docs/zh/install/pip/linux-pip.html to configure environment".format(case_type, case_name))
+                os._exit(0)
             else:
                 print("{} {} environment running failure, if you need this environment, please refer to https://github.com/PaddlePaddle/Serving/blob/HEAD/doc/Compile_CN.md to configure environment".format(case_type, case_name))
 
diff --git a/python/paddle_serving_server/env_check/test_fit_a_line.py b/python/paddle_serving_server/env_check/test_fit_a_line.py
index 5550e49e..ad8c21de 100644
--- a/python/paddle_serving_server/env_check/test_fit_a_line.py
+++ b/python/paddle_serving_server/env_check/test_fit_a_line.py
@@ -8,10 +8,7 @@ import sys
 
 from paddle_serving_client import Client
 from paddle_serving_client.httpclient import HttpClient
-from paddle_serving_client.io import inference_model_to_serving
-from paddle_serving_app.reader import SegPostprocess
 from paddle_serving_app.reader import *
-import paddle.inference as paddle_infer
 
 from util import *
 
@@ -31,6 +28,11 @@ class TestFitALine(object):
         self.serving_util.release()
 
     def get_truth_val_by_inference(self):
+        try:
+            import paddle.inference as paddle_infer
+        except:
+            # when paddle is not installed, directly return
+            return
         data = np.array(
             [0.0137, -0.1136, 0.2553, -0.0692, 0.0582, -0.0727, -0.1583, -0.0584, 0.6283, 0.4919, 0.1856, 0.0795,
              -0.0332]).astype("float32")[np.newaxis, :]
diff --git a/python/paddle_serving_server/env_check/test_uci_pipeline.py b/python/paddle_serving_server/env_check/test_uci_pipeline.py
index 585ccf2a..1d32f4e7 100644
--- a/python/paddle_serving_server/env_check/test_uci_pipeline.py
+++ b/python/paddle_serving_server/env_check/test_uci_pipeline.py
@@ -10,7 +10,6 @@ import sys
 from paddle_serving_server.pipeline import PipelineClient
 from paddle_serving_app.reader import CenterCrop, RGB2BGR, Transpose, Div, Normalize, RCNNPostprocess
 from paddle_serving_app.reader import Sequential, File2Image, Resize, Transpose, BGR2RGB, SegPostprocess
-import paddle.inference as paddle_infer
 
 from util import *
 
@@ -30,6 +29,11 @@ class TestUCIPipeline(object):
         self.serving_util.release()
 
     def get_truth_val_by_inference(self):
+        try:
+            import paddle.inference as paddle_infer
+        except:
+            # when paddle is not installed, directly return
+            return
         data = np.array(
             [0.0137, -0.1136, 0.2553, -0.0692, 0.0582, -0.0727, -0.1583, -0.0584, 0.6283, 0.4919, 0.1856, 0.0795,
              -0.0332]).astype("float32")[np.newaxis, :]
-- 
GitLab