From cc6c606f147e95bfec9208ea89bdb3428cc0eb4e Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Fri, 12 Jun 2020 13:49:24 +0800 Subject: [PATCH] discard export PYTHONPATH manually --- README.md | 5 ----- README_en.md | 5 ----- tools/eval.py | 5 +++++ tools/export_model.py | 6 +++--- tools/infer/predict_det.py | 7 ++++++- tools/infer/predict_rec.py | 5 +++++ tools/infer/predict_system.py | 7 ++++--- tools/infer_det.py | 9 +++++---- tools/infer_rec.py | 14 ++++++-------- tools/train.py | 6 +++--- 10 files changed, 37 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 5f6bca2d..07479a9b 100644 --- a/README.md +++ b/README.md @@ -69,11 +69,6 @@ cd .. ```bash -# 设置PYTHONPATH环境变量 -export PYTHONPATH=. -# windows下设置环境变量 -SET PYTHONPATH=. - # 预测image_dir指定的单张图像 python3 tools/infer/predict_system.py --image_dir="./doc/imgs/11.jpg" --det_model_dir="./inference/ch_det_mv3_db/" --rec_model_dir="./inference/ch_rec_mv3_crnn/" diff --git a/README_en.md b/README_en.md index 8005e09e..c3420302 100644 --- a/README_en.md +++ b/README_en.md @@ -69,11 +69,6 @@ The following code implements text detection and recognition inference tandemly. ```bash -# Set PYTHONPATH environment variable -export PYTHONPATH=. -# Setting environment variable in Windows -SET PYTHONPATH=. - # Prediction on a single image by specifying image path to image_dir python3 tools/infer/predict_system.py --image_dir="./doc/imgs/11.jpg" --det_model_dir="./inference/ch_det_mv3_db/" --rec_model_dir="./inference/ch_rec_mv3_crnn/" diff --git a/tools/eval.py b/tools/eval.py index d1762e92..5517049d 100755 --- a/tools/eval.py +++ b/tools/eval.py @@ -17,6 +17,11 @@ from __future__ import division from __future__ import print_function import os +import os +import sys +__dir__ = os.path.dirname(__file__) +sys.path.append(__dir__) +sys.path.append(os.path.join(__dir__, '..')) def set_paddle_flags(**kwargs): diff --git a/tools/export_model.py b/tools/export_model.py index 555ba7b0..4415eda8 100644 --- a/tools/export_model.py +++ b/tools/export_model.py @@ -18,9 +18,9 @@ from __future__ import print_function import os import sys -import time -import multiprocessing -import numpy as np +__dir__ = os.path.dirname(__file__) +sys.path.append(__dir__) +sys.path.append(os.path.join(__dir__, '..')) def set_paddle_flags(**kwargs): diff --git a/tools/infer/predict_det.py b/tools/infer/predict_det.py index 35d8a09d..93a21c51 100755 --- a/tools/infer/predict_det.py +++ b/tools/infer/predict_det.py @@ -11,8 +11,13 @@ # 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 os +import sys +__dir__ = os.path.dirname(__file__) +sys.path.append(__dir__) +sys.path.append(os.path.join(__dir__, '../..')) -import utility +import tools.infer.utility as utility from ppocr.utils.utility import initial_logger logger = initial_logger() from ppocr.utils.utility import get_image_file_list diff --git a/tools/infer/predict_rec.py b/tools/infer/predict_rec.py index d47b81af..249d1006 100755 --- a/tools/infer/predict_rec.py +++ b/tools/infer/predict_rec.py @@ -11,6 +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. +import os +import sys +__dir__ = os.path.dirname(__file__) +sys.path.append(__dir__) +sys.path.append(os.path.join(__dir__, '../..')) import utility from ppocr.utils.utility import initial_logger diff --git a/tools/infer/predict_system.py b/tools/infer/predict_system.py index 1019279a..032d094c 100755 --- a/tools/infer/predict_system.py +++ b/tools/infer/predict_system.py @@ -16,12 +16,13 @@ import sys __dir__ = os.path.dirname(__file__) sys.path.append(__dir__) sys.path.append(os.path.join(__dir__, '../..')) -import utility + +import tools.infer.utility as utility from ppocr.utils.utility import initial_logger logger = initial_logger() import cv2 -import predict_det -import predict_rec +import tools.infer.predict_det as predict_det +import tools.infer.predict_rec as predict_rec import copy import numpy as np import math diff --git a/tools/infer_det.py b/tools/infer_det.py index 80006765..f7dbd8eb 100755 --- a/tools/infer_det.py +++ b/tools/infer_det.py @@ -16,14 +16,15 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os -import sys -import time import numpy as np from copy import deepcopy import json -# from paddle.fluid.contrib.model_stat import summary +import os +import sys +__dir__ = os.path.dirname(__file__) +sys.path.append(__dir__) +sys.path.append(os.path.join(__dir__, '..')) def set_paddle_flags(**kwargs): diff --git a/tools/infer_rec.py b/tools/infer_rec.py index ec64a38b..b1ddc8dd 100755 --- a/tools/infer_rec.py +++ b/tools/infer_rec.py @@ -16,10 +16,12 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os -import time -import multiprocessing import numpy as np +import os +import sys +__dir__ = os.path.dirname(__file__) +sys.path.append(__dir__) +sys.path.append(os.path.join(__dir__, '..')) def set_paddle_flags(**kwargs): @@ -35,10 +37,7 @@ set_paddle_flags( FLAGS_eager_delete_tensor_gb=0, # enable GC to save memory ) -from paddle import fluid - -# from ppocr.utils.utility import load_config, merge_config -import program +import tools.program as program from paddle import fluid from ppocr.utils.utility import initial_logger logger = initial_logger() @@ -47,7 +46,6 @@ from ppocr.utils.save_load import init_model from ppocr.utils.character import CharacterOps from ppocr.utils.utility import create_module from ppocr.utils.utility import get_image_file_list -logger = initial_logger() def main(): diff --git a/tools/train.py b/tools/train.py index 4f69d40f..287ed205 100755 --- a/tools/train.py +++ b/tools/train.py @@ -18,9 +18,9 @@ from __future__ import print_function import os import sys -import time -import multiprocessing -import numpy as np +__dir__ = os.path.dirname(__file__) +sys.path.append(__dir__) +sys.path.append(os.path.join(__dir__, '..')) def set_paddle_flags(**kwargs): -- GitLab