Merge pull request #1246 from TeslaZhao/develop

Fix config.yml error of Pipeline examples

python/examples/pipeline/PaddleClas/DarkNet53/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: DarkNet53/ppcls_model/
 

python/examples/pipeline/PaddleClas/HRNet_W18_C/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: HRNet_W18_C/ppcls_model/
 

python/examples/pipeline/PaddleClas/MobileNetV1/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: MobileNetV1/ppcls_model/
 

python/examples/pipeline/PaddleClas/MobileNetV2/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: MobileNetV2/ppcls_model/
 

python/examples/pipeline/PaddleClas/MobileNetV3_large_x1_0/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 2
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 2
-
             #uci模型路径
             model_config:  MobileNetV3_large_x1_0/ppcls_model/
 

python/examples/pipeline/PaddleClas/ResNeXt101_vd_64x4d/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: ResNeXt101_vd_64x4d/ppcls_model/
 

python/examples/pipeline/PaddleClas/ResNet50_vd/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: ResNet50_vd/ppcls_model/
 

python/examples/pipeline/PaddleClas/ResNet50_vd_FPGM/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: ResNet50_vd_FPGM/ppcls_model/
 

python/examples/pipeline/PaddleClas/ResNet50_vd_KL/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: ResNet50_vd_KL/ppcls_model/
 

python/examples/pipeline/PaddleClas/ResNet50_vd_PACT/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: ResNet50_vd_PACT/ppcls_model/
 

python/examples/pipeline/PaddleClas/ResNet_V2_50/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: resnet_v2_50_imagenet_model/
 

python/examples/pipeline/PaddleClas/ShuffleNetV2_x1_0/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 1
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 1
-
             #uci模型路径
             model_config: ShuffleNetV2_x1_0/ppcls_model/
 

python/examples/pipeline/PaddleDetection/faster_rcnn/config.yml

@@ -5,9 +5,10 @@ dag:
 http_port: 18082
 op:
   faster_rcnn:
+    concurrency: 2
+
     local_service_conf:
       client_type: local_predictor
-      concurrency: 2
       device_type: 1
       devices: '2'
       fetch_list:

python/examples/pipeline/PaddleDetection/ppyolo_mbv3/config.yml

@@ -5,9 +5,10 @@ dag:
 http_port: 18082
 op:
   ppyolo_mbv3:
+    concurrency: 10
+
     local_service_conf:
       client_type: local_predictor
-      concurrency: 10
       device_type: 1
       devices: '2'
       fetch_list:

python/examples/pipeline/PaddleDetection/yolov3/config.yml

@@ -5,9 +5,10 @@ dag:
 http_port: 18082
 op:
   yolov3:
+    concurrency: 10
+
     local_service_conf:
       client_type: local_predictor
-      concurrency: 10
       device_type: 1
       devices: '2'
       fetch_list:

python/examples/pipeline/bert/config.yml

+worker_num: 20
 dag:
   is_thread_op: false
   tracer:
     interval_s: 10
 http_port: 18082
+rpc_port: 9998
 op:
   bert:
+    concurrency: 2
+
     local_service_conf:
       client_type: local_predictor
-      concurrency: 2
       device_type: 1
       devices: '2'
       fetch_list:
-      - pooled_output
       model_config: bert_seq128_model/
-rpc_port: 9998
-worker_num: 20

python/examples/pipeline/imagenet/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     imagenet:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 2
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 2
-
             #uci模型路径
             model_config: ResNet50_vd_model
 

python/examples/pipeline/simple_web_service/config.yml

@@ -11,12 +11,12 @@ dag:
     is_thread_op: False
 op:
     uci:
+        #并发数，is_thread_op=True时，为线程并发；否则为进程并发
+        concurrency: 2
+
         #当op配置没有server_endpoints时，从local_service_conf读取本地服务配置
         local_service_conf:
 
-            #并发数，is_thread_op=True时，为线程并发；否则为进程并发
-            concurrency: 2
-
             #uci模型路径
             model_config: uci_housing_model