From 55db5c6271637f0037afd2d17c47fcb12141022e Mon Sep 17 00:00:00 2001
From: MRXLT <xlt2024@gmail.com>
Date: Thu, 19 Dec 2019 16:34:58 +0800
Subject: [PATCH] use local model

---
 serving/server/plsc_serving/__init__.py     |  2 +-
 serving/server/plsc_serving/run/__init__.py | 24 +++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/serving/server/plsc_serving/__init__.py b/serving/server/plsc_serving/__init__.py
index e7b8b2e..0564d9c 100644
--- a/serving/server/plsc_serving/__init__.py
+++ b/serving/server/plsc_serving/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '0.1.4'
+__version__ = '0.1.6'
diff --git a/serving/server/plsc_serving/run/__init__.py b/serving/server/plsc_serving/run/__init__.py
index 457c6ed..5e43b23 100644
--- a/serving/server/plsc_serving/run/__init__.py
+++ b/serving/server/plsc_serving/run/__init__.py
@@ -63,6 +63,9 @@ class PLSCServer():
     def modify_conf(self, gpu_index=0):
         os.chdir(self.get_path())
         engine_name = 'name: "face_resnet50"'
+        if self.model_path_str == '':
+            print('Please set model path using with_model.')
+            return -1
         if not self.with_gpu_flag:
             with open('./conf/model_toolkit.prototxt', 'r') as f:
                 conf_str = f.read()
@@ -86,6 +89,8 @@ class PLSCServer():
                               'enable_memory_optimization: 1', conf_str)
             open(conf_file, 'w').write(conf_str)
 
+        return 0
+
     def hold(self):
         try:
             while True:
@@ -99,6 +104,10 @@ class PLSCServer():
         os.chdir(self.get_path())
         self.modify_conf(gpu_index)
 
+        if self.modify_conf(gpu_index) != 0:
+            print('Modify conf files failed')
+            return -1
+
         if self.with_gpu_flag == True:
             gpu_msg = '--gpuid=' + str(gpu_index) + ' '
             run_cmd = self.gpu_run_cmd + gpu_msg
@@ -150,16 +159,13 @@ class PLSCServer():
         print(conf_str)
         '''
 
-    def with_model(self, model_name=None, model_url=None):
-        '''
-        if model_url != None:
-            self.mode_url = model_url
-            self.use_other_model = True
-        '''
-        if model_name == None or type(model_name) != str:
-            print('Please set model name string')
+    def with_model(self, model_path=None):
+        if not (os.path.isabs(model_path) and os.path.exists(model_path)):
+            print('Please set correct absolute path for model file')
+            return -1
+
+        self.model_path_str = r'model_data_path: "' + model_path + r'"'
         os.chdir(self.get_path())
-        self.get_model(model_name)
 
     def get_path(self):
         py_path = os.path.dirname(plsc_serving.__file__)
-- 
GitLab