Skip to content

fix setup and some filename #291

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.

Sign up for GitHub

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 1 commit into from
May 16, 2023
Merged

fix setup and some filename #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 ...y_infer/src/configs/cls/ppocr/cls_mv3.yml → ..._infer/src/configs/cls/ppocr/cls_mv3.yaml
View file
Open in desktop
File renamed without changes.
0 ...configs/det/ppocr/ch_PP-OCRv3_det_cml.yml → ...onfigs/det/ppocr/ch_PP-OCRv3_det_cml.yaml
View file
Open in desktop
File renamed without changes.
0 ...onfigs/det/ppocr/ch_det_res18_db_v2.0.yml → ...nfigs/det/ppocr/ch_det_res18_db_v2.0.yaml
View file
Open in desktop
File renamed without changes.
0 ...ec/ppocr/ch_PP-OCRv3_rec_distillation.yml → ...c/ppocr/ch_PP-OCRv3_rec_distillation.yaml
View file
Open in desktop
File renamed without changes.
0 ...c/ppocr/rec_chinese_common_train_v2.0.yml → .../ppocr/rec_chinese_common_train_v2.0.yaml
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions deploy/py_infer/src/utils/adapted/paddleocr_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@


PADDLEOCR_MODELS = {
"ch_pp_server_det_v2.0": "det/ppocr/ch_det_res18_db_v2.0.yml", # ch_ppocr_server_v2.0_det
"ch_pp_det_v3": "det/ppocr/ch_PP-OCRv3_det_cml.yml", # ch_PP-OCRv3_det
"ch_pp_server_rec_v2.0": "rec/ppocr/rec_chinese_common_train_v2.0.yml", # ch_ppocr_server_v2.0_rec
"ch_pp_rec_v3": "rec/ppocr/ch_PP-OCRv3_rec_distillation.yml", # ch_PP-OCRv3_rec
"ch_pp_mobile_cls_v2.0": "cls/ppocr/cls_mv3.yml" # ch_ppocr_mobile_v2.0_cls
"ch_pp_server_det_v2.0": "det/ppocr/ch_det_res18_db_v2.0.yaml", # ch_ppocr_server_v2.0_det
"ch_pp_det_v3": "det/ppocr/ch_PP-OCRv3_det_cml.yaml", # ch_PP-OCRv3_det
"ch_pp_server_rec_v2.0": "rec/ppocr/rec_chinese_common_train_v2.0.yaml", # ch_ppocr_server_v2.0_rec
"ch_pp_rec_v3": "rec/ppocr/ch_PP-OCRv3_rec_distillation.yaml", # ch_PP-OCRv3_rec
"ch_pp_mobile_cls_v2.0": "cls/ppocr/cls_mv3.yaml" # ch_ppocr_mobile_v2.0_cls
}
1 change: 1 addition & 0 deletions mindocr/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from .postprocess import *
from .metrics import *
from .utils import *
from .version import __version__

__all__ = []
__all__.extend(data.__all__)
Expand Down
0 version.py → mindocr/version.py
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ BASEPATH=$(cd "$(dirname $0)"; pwd)
OUTPUT_PATH="${BASEPATH}/output"
PYTHON=$(which python3)

pip install setuptools==65.6.3

mk_new_dir() {
local create_dir="$1" # the target to make
Expand Down
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env python

from setuptools import setup
from setuptools import setup, find_packages

exec(open("version.py").read())
exec(open("mindocr/version.py").read())

def read_requirements(fps):
reqs = []
Expand All @@ -24,7 +24,7 @@ def read_requirements(fps):
description="A toolbox of OCR models and algorithms based on MindSpore.",
license="Apache Software License 2.0",
include_package_data=True,
package_dir={"mindocr": "mindocr"},
packages=find_packages(include=["mindocr", "mindocr.*"]),
install_requires=read_requirements(['requirements.txt']),
python_requires=">=3.7",
classifiers=[
Expand Down