diff --git a/__init__.py b/__init__.py index e22e466a8426c437407c491bbae47c3b66defa2e..15a9aca4da19a981b9e678e7cc93e33cf40fc81c 100644 --- a/__init__.py +++ b/__init__.py @@ -11,8 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import paddleocr from .paddleocr import * __version__ = paddleocr.VERSION -__all__ = ['PaddleOCR', 'PPStructure', 'draw_ocr', 'draw_structure_result', 'save_structure_res','download_with_progressbar'] +__all__ = [ + 'PaddleOCR', 'PPStructure', 'draw_ocr', 'draw_structure_result', + 'save_structure_res', 'download_with_progressbar' +] diff --git a/paddleocr.py b/paddleocr.py index c550fc5e26a0bf0a9603663ec1e9f32e3ce29381..ffe28d002e32dc5550037e498b6d90a65ca9e5b1 100644 --- a/paddleocr.py +++ b/paddleocr.py @@ -11,9 +11,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +from __future__ import absolute_import import os import sys +import importlib __dir__ = os.path.dirname(__file__) @@ -26,6 +28,10 @@ import logging import numpy as np from pathlib import Path +tools = importlib.import_module('.', 'tools') +ppocr = importlib.import_module('.', 'ppocr') +ppstructure = importlib.import_module('.', 'ppstructure') + from tools.infer import predict_system from ppocr.utils.logging import get_logger @@ -42,7 +48,7 @@ __all__ = [ ] SUPPORT_DET_MODEL = ['DB'] -VERSION = '2.4.0.2' +VERSION = '2.4.0.3' SUPPORT_REC_MODEL = ['CRNN'] BASE_DIR = os.path.expanduser("~/.paddleocr/")