测试扭曲矫正模型

docker-compose-test.yml

@@ -20,26 +20,26 @@ x-paddle:
     - ./tmp_img:/app/tmp_img
 
 services:
-  ocr_api:
-    <<: *paddle_template
-    build:
-      context: ./services/paddle_services
-    container_name: ocr_api
-    hostname: ocr_api
-    command: [ '-w','1','ocr_api:app','--bind','0.0.0.0:5001' ]
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - device_ids: [ '0' ]
-              capabilities: [ 'gpu' ]
-              driver: 'nvidia'
+#  ocr_api:
+#    <<: *paddle_template
+#    build:
+#      context: ./services/paddle_services
+#    container_name: ocr_api
+#    hostname: ocr_api
+#    command: [ '-w','1','ocr_api:app','--bind','0.0.0.0:5001' ]
+#    deploy:
+#      resources:
+#        reservations:
+#          devices:
+#            - device_ids: [ '0' ]
+#              capabilities: [ 'gpu' ]
+#              driver: 'nvidia'
 
 #  settlement_api:
 #    <<: *paddle_template
 #    container_name: settlement_api
 #    hostname: settlement_api
-#    command: [ '-w 5 ./services/settlement_api:app --bind 0.0.0.0:5002' ]
+#    command: [ '-w', '1', 'settlement_api:app', '--bind', '0.0.0.0:5002' ]
 #    deploy:
 #      resources:
 #        reservations:
@@ -100,18 +100,18 @@ services:
 #              capabilities: [ 'gpu' ]
 #              driver: 'nvidia'
 #
-#  dewarp_api:
-#    <<: *paddle_template
-#    container_name: dewarp_api
-#    hostname: dewarp_api
-#    command: [ '-w 5 ./services/dewarp_api:app --bind 0.0.0.0:5007' ]
-#    deploy:
-#      resources:
-#        reservations:
-#          devices:
-#            - device_ids: [ '0' ]
-#              capabilities: [ 'gpu' ]
-#              driver: 'nvidia'
+  dewarp_api:
+    <<: *paddle_template
+    container_name: dewarp_api
+    hostname: dewarp_api
+    command: [ '-w', '1', 'dewarp_api:app', '--bind', '0.0.0.0:5007' ]
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - device_ids: [ '0' ]
+              capabilities: [ 'gpu' ]
+              driver: 'nvidia'
 
   api_test:
     <<: *project_template
@@ -120,11 +120,11 @@ services:
     container_name: api_test
     hostname: api_test
     depends_on:
-      - ocr_api
+#      - ocr_api
 #      - settlement_api
 #      - discharge_api
 #      - cost_api
 #      - clas_api
 #      - det_api
-#      - dewarp_api
+      - dewarp_api
     command: [ 'api_test.py' ]

docker-compose.yml

@@ -5,17 +5,19 @@ x-base:
 x-project:
   &project_template
   <<: *base_template
-  image: fcb_photo_review:1.14.6
+  image: fcb_photo_review:2.0.0
   volumes:
     - ./log:/app/log
+    - ./tmp_img:/app/tmp_img
 
 x-paddle:
   &paddle_template
   <<: *base_template
   image: fcb_paddle:0.0.1
   volumes:
-    - ./log:/app/log
-    - ./model:/app/model
+    - ./services/paddle_services/log:/app/log
+    - ./services/paddle_services/model:/app/model
+    - ./tmp_img:/app/tmp_img
 
 services:
   ocr_api:
@@ -24,7 +26,7 @@ services:
       context: ./services/paddle_services
     container_name: ocr_api
     hostname: ocr_api
-    command: [ '-w 5 ./services/ocr_api:app --bind 0.0.0.0:5001' ]
+    command: [ '-w', '1', 'ocr_api:app', '--bind', '0.0.0.0:5001' ]
     deploy:
       resources:
         reservations:
@@ -37,7 +39,7 @@ services:
     <<: *paddle_template
     container_name: settlement_api
     hostname: settlement_api
-    command: [ '-w 5 ./services/settlement_api:app --bind 0.0.0.0:5002' ]
+    command: [ '-w', '1', 'settlement_api:app', '--bind', '0.0.0.0:5002' ]
     deploy:
       resources:
         reservations:
@@ -50,7 +52,7 @@ services:
     <<: *paddle_template
     container_name: discharge_api
     hostname: discharge_api
-    command: [ '-w 5 ./services/discharge_api:app --bind 0.0.0.0:5003' ]
+    command: [ '-w', '1', 'discharge_api:app', '--bind', '0.0.0.0:5003' ]
     deploy:
       resources:
         reservations:
@@ -63,7 +65,7 @@ services:
     <<: *paddle_template
     container_name: cost_api
     hostname: cost_api
-    command: [ '-w 5 ./services/cost_api:app --bind 0.0.0.0:5004' ]
+    command: [ '-w', '1', 'cost_api:app', '--bind', '0.0.0.0:5004' ]
     deploy:
       resources:
         reservations:
@@ -76,7 +78,7 @@ services:
     <<: *paddle_template
     container_name: clas_api
     hostname: clas_api
-    command: [ '-w 5 ./services/clas_api:app --bind 0.0.0.0:5005' ]
+    command: [ '-w', '1', 'clas_api:app', '--bind', '0.0.0.0:5005' ]
     deploy:
       resources:
         reservations:
@@ -89,7 +91,7 @@ services:
     <<: *paddle_template
     container_name: det_api
     hostname: det_api
-    command: [ '-w 5 ./services/det_api:app --bind 0.0.0.0:5006' ]
+    command: [ '-w', '1', 'det_api:app', '--bind', '0.0.0.0:5006' ]
     deploy:
       resources:
         reservations:
@@ -102,7 +104,7 @@ services:
     <<: *paddle_template
     container_name: dewarp_api
     hostname: dewarp_api
-    command: [ '-w 5 ./services/dewarp_api:app --bind 0.0.0.0:5007' ]
+    command: [ '-w', '1', 'dewarp_api:app', '--bind', '0.0.0.0:5007' ]
     deploy:
       resources:
         reservations:
@@ -127,37 +129,37 @@ services:
       - dewarp_api
     command: [ 'photo_review.py', '--clean', 'True' ]
 
-  photo_review_2:
-    <<: *project_template
-    container_name: photo_review_2
-    hostname: photo_review_2
-    depends_on:
-      - photo_review_1
-    command: [ 'photo_review.py' ]
-
-  photo_review_3:
-    <<: *project_template
-    container_name: photo_review_3
-    hostname: photo_review_3
-    depends_on:
-      - photo_review_2
-    command: [ 'photo_review.py' ]
-
-  photo_review_4:
-    <<: *project_template
-    container_name: photo_review_4
-    hostname: photo_review_4
-    depends_on:
-      - photo_review_3
-    command: [ 'photo_review.py' ]
-
-  photo_review_5:
-    <<: *project_template
-    container_name: photo_review_5
-    hostname: photo_review_5
-    depends_on:
-      - photo_review_4
-    command: [ 'photo_review.py' ]
+  #  photo_review_2:
+  #    <<: *project_template
+  #    container_name: photo_review_2
+  #    hostname: photo_review_2
+  #    depends_on:
+  #      - photo_review_1
+  #    command: [ 'photo_review.py' ]
+  #
+  #  photo_review_3:
+  #    <<: *project_template
+  #    container_name: photo_review_3
+  #    hostname: photo_review_3
+  #    depends_on:
+  #      - photo_review_2
+  #    command: [ 'photo_review.py' ]
+  #
+  #  photo_review_4:
+  #    <<: *project_template
+  #    container_name: photo_review_4
+  #    hostname: photo_review_4
+  #    depends_on:
+  #      - photo_review_3
+  #    command: [ 'photo_review.py' ]
+  #
+  #  photo_review_5:
+  #    <<: *project_template
+  #    container_name: photo_review_5
+  #    hostname: photo_review_5
+  #    depends_on:
+  #      - photo_review_4
+  #    command: [ 'photo_review.py' ]
 
   photo_mask_1:
     <<: *project_template
@@ -173,10 +175,10 @@ services:
       - dewarp_api
     command: [ 'photo_mask.py', '--clean', 'True' ]
 
-  photo_mask_2:
-    <<: *project_template
-    container_name: photo_mask_2
-    hostname: photo_mask_2
-    depends_on:
-      - photo_mask_1
-    command: [ 'photo_mask.py' ]
+#  photo_mask_2:
+#    <<: *project_template
+#    container_name: photo_mask_2
+#    hostname: photo_mask_2
+#    depends_on:
+#      - photo_mask_1
+#    command: [ 'photo_mask.py' ]