Skip to content

Commit cc6c606

Browse files
LDOUBLEVLDOUBLEV
committed
discard export PYTHONPATH manually
1 parent 25189dc commit cc6c606

10 files changed

Lines changed: 37 additions & 32 deletions

File tree

‎README.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ cd ..
6969

7070
```bash
7171

72-
# 设置PYTHONPATH环境变量
73-
export PYTHONPATH=.
74-
# windows下设置环境变量
75-
SET PYTHONPATH=.
76-
7772
# 预测image_dir指定的单张图像
7873
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/"
7974

‎README_en.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ The following code implements text detection and recognition inference tandemly.
6969

7070
```bash
7171

72-
# Set PYTHONPATH environment variable
73-
export PYTHONPATH=.
74-
# Setting environment variable in Windows
75-
SET PYTHONPATH=.
76-
7772
# Prediction on a single image by specifying image path to image_dir
7873
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/"
7974

‎tools/eval.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
from __future__ import print_function
1818

1919
import os
20+
import os
21+
import sys
22+
__dir__ = os.path.dirname(__file__)
23+
sys.path.append(__dir__)
24+
sys.path.append(os.path.join(__dir__, '..'))
2025

2126

2227
def set_paddle_flags(**kwargs):

‎tools/export_model.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import os
2020
import sys
21-
import time
22-
import multiprocessing
23-
import numpy as np
21+
__dir__ = os.path.dirname(__file__)
22+
sys.path.append(__dir__)
23+
sys.path.append(os.path.join(__dir__, '..'))
2424

2525

2626
def set_paddle_flags(**kwargs):

‎tools/infer/predict_det.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
import os
15+
import sys
16+
__dir__ = os.path.dirname(__file__)
17+
sys.path.append(__dir__)
18+
sys.path.append(os.path.join(__dir__, '../..'))
1419

15-
import utility
20+
import tools.infer.utility as utility
1621
from ppocr.utils.utility import initial_logger
1722
logger = initial_logger()
1823
from ppocr.utils.utility import get_image_file_list

‎tools/infer/predict_rec.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
import os
15+
import sys
16+
__dir__ = os.path.dirname(__file__)
17+
sys.path.append(__dir__)
18+
sys.path.append(os.path.join(__dir__, '../..'))
1419

1520
import utility
1621
from ppocr.utils.utility import initial_logger

‎tools/infer/predict_system.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
__dir__ = os.path.dirname(__file__)
1717
sys.path.append(__dir__)
1818
sys.path.append(os.path.join(__dir__, '../..'))
19-
import utility
19+
20+
import tools.infer.utility as utility
2021
from ppocr.utils.utility import initial_logger
2122
logger = initial_logger()
2223
import cv2
23-
import predict_det
24-
import predict_rec
24+
import tools.infer.predict_det as predict_det
25+
import tools.infer.predict_rec as predict_rec
2526
import copy
2627
import numpy as np
2728
import math

‎tools/infer_det.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
from __future__ import division
1717
from __future__ import print_function
1818

19-
import os
20-
import sys
21-
import time
2219
import numpy as np
2320
from copy import deepcopy
2421
import json
2522

26-
# from paddle.fluid.contrib.model_stat import summary
23+
import os
24+
import sys
25+
__dir__ = os.path.dirname(__file__)
26+
sys.path.append(__dir__)
27+
sys.path.append(os.path.join(__dir__, '..'))
2728

2829

2930
def set_paddle_flags(**kwargs):

‎tools/infer_rec.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
from __future__ import division
1717
from __future__ import print_function
1818

19-
import os
20-
import time
21-
import multiprocessing
2219
import numpy as np
20+
import os
21+
import sys
22+
__dir__ = os.path.dirname(__file__)
23+
sys.path.append(__dir__)
24+
sys.path.append(os.path.join(__dir__, '..'))
2325

2426

2527
def set_paddle_flags(**kwargs):
@@ -35,10 +37,7 @@ def set_paddle_flags(**kwargs):
3537
FLAGS_eager_delete_tensor_gb=0, # enable GC to save memory
3638
)
3739

38-
from paddle import fluid
39-
40-
# from ppocr.utils.utility import load_config, merge_config
41-
import program
40+
import tools.program as program
4241
from paddle import fluid
4342
from ppocr.utils.utility import initial_logger
4443
logger = initial_logger()
@@ -47,7 +46,6 @@ def set_paddle_flags(**kwargs):
4746
from ppocr.utils.character import CharacterOps
4847
from ppocr.utils.utility import create_module
4948
from ppocr.utils.utility import get_image_file_list
50-
logger = initial_logger()
5149

5250

5351
def main():

‎tools/train.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import os
2020
import sys
21-
import time
22-
import multiprocessing
23-
import numpy as np
21+
__dir__ = os.path.dirname(__file__)
22+
sys.path.append(__dir__)
23+
sys.path.append(os.path.join(__dir__, '..'))
2424

2525

2626
def set_paddle_flags(**kwargs):

0 commit comments

Comments
 (0)