Merge pull request PaddlePaddle#7 from MRXLT/master

fix server conf && __init__
qizhaoaoe · Dec 18, 2019 · 9d1fbf2 · 9d1fbf2
2 parents 18f3b86 + 76a8cc2
commit 9d1fbf2
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 36 deletions.
diff --git a/serving/server/plsc_serving/run/__init__.py b/serving/server/plsc_serving/run/__init__.py
@@ -15,7 +15,7 @@
 import os
 import re
 import tarfile
-import face_serving
+import plsc_serving
 import subprocess
 import imp
 import time
@@ -37,7 +37,7 @@ def __init__(self, with_gpu=True):
 
     def get_exe(self):
         exe_path = './bin'
-        module_version = face_serving.__version__
+        module_version = plsc_serving.__version__
         target_version_list = module_version.strip().split('.')
         target_version = target_version_list[0] + '.' + target_version_list[1]
         need_download = False
@@ -162,7 +162,7 @@ def with_model(self, model_name=None, model_url=None):
         self.get_model(model_name)
 
     def get_path(self):
-        py_path = os.path.dirname(face_serving.__file__)
+        py_path = os.path.dirname(plsc_serving.__file__)
         server_path = os.path.join(py_path, 'server')
         return server_path
 

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt
@@ -3,7 +3,7 @@ engines {
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.0 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.0
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.1 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.1
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.10 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.10
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.11 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.11
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.12 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.12
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.13 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.13
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.14 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.14
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.15 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.15
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.2 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.2
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.3 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.3
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.4 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.4
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.5 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.5
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.6 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.6
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.7 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.7
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.8 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.8
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0

diff --git a/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.9 b/serving/server/plsc_serving/server/conf/model_toolkit.prototxt.9
@@ -1,9 +1,9 @@
 engines {
-  name: "bert"
+  name: "face_resnet50"
   type: "FLUID_GPU_ANALYSIS_DIR"
   reloadable_meta: "./data/model/paddle/fluid_time_file"
   reloadable_type: "timestamp_ne"
-  model_data_path: "/home/xulongteng/.paddlehub/bert_service/bert_chinese_L-12_H-768_A-12"
+  model_data_path: "./data/model/paddle/fluid/"
   runtime_thread_num: 0
   batch_infer_size: 0
   enable_batch_align: 0