Merge pull request PaddlePaddle#212 from LokeZhou/deploy

deploy update README
WAYKEN-TSE · Oct 10, 2023 · 0715d11 · 0715d11
2 parents d9aa791 + 9d7dd33
commit 0715d11
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 21 deletions.
diff --git a/deploy/README.md b/deploy/README.md
@@ -45,19 +45,21 @@ Python端预测部署主要包含两个步骤：
 ### 2.1 导出预测模型
 
 ```bash
+cd deploy/groundingdino
 # 导出groundingdino模型
-python deploy/groundingdino/export.py -dt "GroundingDino/groundingdino-swint-ogc" --output_dir=./output
+python export.py \
+--dino_type GroundingDino/groundingdino-swint-ogc
 ```
 导出后目录下，包括 `model_state.pdiparams`,  `model_state.pdiparams.info`, `model_state.pdmodel`等文件。
 
 ### 2.2 基于python的预测
 
 ```bash
- python deploy/groundingdino/predict.py  \
- --text_encoder_type GroundingDino/groundingdino-swint-ogc
- --model_path output_groundingdino \
- --input_image image_you_want_to_detect.jpg \
- -output_dir "dir you want to save the output" \
- -prompt "Detect Cat"
+ python predict.py  \
+ --text_encoder_type GroundingDino/groundingdino-swint-ogc \
+ --model_path output_groundingdino/GroundingDino/groundingdino-swint-ogc \
+ --input_image https://bj.bcebos.com/v1/paddlenlp/models/community/GroundingDino/000000004505.jpg \
+ --output_dir ./groundingdino_predict_output \
+ --prompt "bus"
 
 ```
diff --git a/deploy/groundingdino/README.md b/deploy/groundingdino/README.md
@@ -16,6 +16,8 @@ python setup_ms_deformable_attn_op.py install
 ```
 ## 2.2 静态图导出与预测
 ```bash
+cd deploy/groundingdino
+
 #静态图模型导出
 python export.py \
 --dino_type GroundingDino/groundingdino-swint-ogc
@@ -25,8 +27,8 @@ python export.py \
  python predict.py  \
  --text_encoder_type GroundingDino/groundingdino-swint-ogc \
  --model_path output_groundingdino/GroundingDino/groundingdino-swint-ogc \
- --input_image image_you_want_to_detect.jpg \
- -output_dir "dir you want to save the output" \
- -prompt "Detect Cat"
+ --input_image https://bj.bcebos.com/v1/paddlenlp/models/community/GroundingDino/000000004505.jpg \
+ --output_dir ./groundingdino_predict_output \
+ --prompt "bus"
 
 ```
diff --git a/deploy/groundingdino/predict.py b/deploy/groundingdino/predict.py
@@ -29,8 +29,8 @@
 ms_deformable_attn = load(
     name="deformable_detr_ops",
     sources=[
-        "./paddlemix/models/groundingdino/csrc/ms_deformable_attn_op.cc",
-        "./paddlemix/models/groundingdino/csrc/ms_deformable_attn_op.cu",
+        "../../paddlemix/models/groundingdino/csrc/ms_deformable_attn_op.cc",
+        "../../paddlemix/models/groundingdino/csrc/ms_deformable_attn_op.cu",
     ],
 )
 

diff --git a/deploy/sam/README.md b/deploy/sam/README.md
@@ -18,18 +18,19 @@ python export.py --model_type Sam/SamVitH-1024 --input_type points  --save_dir s
 
 
 #bbox 提示词推理
-python predict.py
---input_image image_you_want_to_detect.jpg \
---box_prompt 548 372 593 429 443 374 482 418 \
+python predict.py \
+--input_image https://bj.bcebos.com/v1/paddlenlp/models/community/GroundingDino/000000004505.jpg \
+--box_prompt 112 118 513 382 \
 --input_type boxs \
 --model_name_or_path Sam/SamVitH-1024 \
---cfg sam_export_SamVitH_boxs/deploy.yaml
+--cfg Sam/SamVitH-1024_boxs/deploy.yaml
+
 
 #points 提示词推理
 python predict.py \
---input_image mage_you_want_to_detect.jpg \
+--input_image https://bj.bcebos.com/v1/paddlenlp/models/community/GroundingDino/000000004505.jpg \
 --points_prompt 548 372 \
 --input_type points \
 --model_name_or_path Sam/SamVitH-1024 \
---cfg sam_export_SamVitH_points/deploy.yaml
+--cfg Sam/SamVitH-1024_points/deploy.yaml
 ```
diff --git a/deploy/sam/export.py b/deploy/sam/export.py
@@ -75,7 +75,7 @@ def main(args):
     ]
     model.eval()
     model = paddle.jit.to_static(model, input_spec=input_spec)
-    save_path = args.save_dir + f"_{args.model_type}_{args.input_type}"
+    save_path = f"{args.model_type}_{args.input_type}"
     paddle.jit.save(model, os.path.join(save_path, "model"))
 
     # TODO add test config

diff --git a/deploy/sam/predict.py b/deploy/sam/predict.py
@@ -302,7 +302,7 @@ def main(model_args, data_args):
     url = data_args.input_image
     # read image
     if os.path.isfile(url):
-        # read image
+
         image_pil = Image.open(data_args.input_image).convert("RGB")
     else:
         image_pil = Image.open(requests.get(url, stream=True).raw).convert("RGB")
@@ -318,7 +318,6 @@ def main(model_args, data_args):
 
     predictor = Predictor(model_args)
 
-    image_pil = Image.open(data_args.input_image).convert("RGB")
     seg_masks = predictor.run(image_pil, {"points": data_args.points_prompt, "boxs": data_args.box_prompt})
 
     if model_args.visual: