Skip to content

revise whl deploy setting and version info #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
python -m build
- name: Publish package
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
run: |
twine upload dist/*
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include LICENSE
include README.md
include requirements.txt

recursive-include mindocr *.py
2 changes: 1 addition & 1 deletion mindocr/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""version init"""
__version__ = "0.2.0"
__version__ = "0.4.0"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rapidfuzz>=2.13.7
Pillow>=9.1.1,<=9.5
PyYAML>=6.0
xml-python>=0.4.3
packaging
packaging>=23.1
Cython
lanms>=1.0.2
sentencepiece>=0.1.99
Expand Down
10 changes: 3 additions & 7 deletions tools/infer/text/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def create_parser():
parser.add_argument("--mode", type=int, default=0, help="0 for graph mode, 1 for pynative mode ") # added

# params for text detector
parser.add_argument("--image_dir", type=str, help="image path or image directory")
parser.add_argument("--image_dir", type=str, required=True, help="image path or image directory")
# parser.add_argument("--page_num", type=int, default=0)
parser.add_argument(
"--det_algorithm",
Expand All @@ -38,7 +38,7 @@ def create_parser():
default="O0",
choices=["O0", "O1", "O2", "O3"],
help="Auto Mixed Precision level. This setting only works on GPU and Ascend",
) # added
)
parser.add_argument(
"--det_model_dir",
type=str,
Expand Down Expand Up @@ -87,7 +87,7 @@ def create_parser():
default="O0",
choices=["O0", "O1", "O2", "O3"],
help="Auto Mixed Precision level. This setting only works on GPU and Ascend",
) # added
)
parser.add_argument(
"--rec_model_dir",
type=str,
Expand Down Expand Up @@ -121,11 +121,7 @@ def create_parser():
# parser.add_argument("--use_space_char", type=str2bool, default=True)
parser.add_argument("--vis_font_path", type=str, default="docs/fonts/simfang.ttf")
parser.add_argument("--drop_score", type=float, default=0.5)
parser.add_argument(
"--rec_gt_path", type=str, default=None, help="Path to ground truth labels of the recognition result"
) # added

#
parser.add_argument(
"--draw_img_save_dir",
type=str,
Expand Down
26 changes: 20 additions & 6 deletions tools/infer/text/res_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,31 @@
--rec_gt_path /Users/Samit/Data/datasets/ic15/rec/test/rec_gt.txt
"""

from config import parse_args
import argparse

from utils import eval_rec_res


def parse_args():
parser = argparse.ArgumentParser(description="Result Evaluation Config Args")

parser.add_argument(
"--draw_img_save_dir",
type=str,
default="./inference_results",
help="Dir to save visualization and detection/recogintion/system prediction results",
)
parser.add_argument(
"--rec_gt_path", type=str, default=None, help="Path to ground truth labels of the recognition result"
)

args = parser.parse_args()
return args


if __name__ == "__main__":
# parse args
args = parse_args()

# pred_fp = 'inference_results/rec_results.txt'
# pred_fp = 'inference_results/rec_results_serail.txt'
# rec_gt_fp = '/Users/Samit/Data/datasets/ic15/rec/test/rec_gt.txt'

pred_fp = args.draw_img_save_dir
rec_gt_fp = args.rec_gt_path

Expand Down