From d64252b8dc3fdb2840e386cf2a56e2ed85a8c1e2 Mon Sep 17 00:00:00 2001
From: root <root@bjyz-sys-gpu-kongming9.bjyz.baidu.com>
Date: Tue, 16 Aug 2022 13:24:57 +0000
Subject: [PATCH] fix: rm sys.path.append in main python file
avoid to raising error when there is a foler or python file that has same name in working directory
---
MANIFEST.in | 7 +++----
deploy/python/predict_cls.py | 16 +++++-----------
deploy/python/preprocess.py | 2 +-
deploy/utils/config.py | 2 +-
paddleclas.py | 9 ++++++---
setup.py | 2 +-
6 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index 97372da00..1bf8c5ea0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,6 @@ include LICENSE.txt
include README.md
include docs/en/whl_en.md
recursive-include deploy/python *.py
-recursive-include deploy/configs *.yaml
-recursive-include deploy/utils get_image_list.py config.py logger.py predictor.py
-
-recursive-include ppcls/ *.py *.txt
\ No newline at end of file
+recursive-include deploy/utils *.py
+recursive-include ppcls/ *.py *.txt
+recursive-include deploy/configs *.yaml
\ No newline at end of file
diff --git a/deploy/python/predict_cls.py b/deploy/python/predict_cls.py
index 49bf62fa3..e4ff25415 100644
--- a/deploy/python/predict_cls.py
+++ b/deploy/python/predict_cls.py
@@ -11,21 +11,15 @@
# 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(os.path.abspath(__file__))
-sys.path.append(os.path.abspath(os.path.join(__dir__, '../')))
import cv2
import numpy as np
-from utils import logger
-from utils import config
-from utils.predictor import Predictor
-from utils.get_image_list import get_image_list
-from python.preprocess import create_operators
-from python.postprocess import build_postprocess
+from paddleclas.deploy.utils import logger, config
+from paddleclas.deploy.utils.predictor import Predictor
+from paddleclas.deploy.utils.get_image_list import get_image_list
+from paddleclas.deploy.python.preprocess import create_operators
+from paddleclas.deploy.python.postprocess import build_postprocess
class ClsPredictor(Predictor):
diff --git a/deploy/python/preprocess.py b/deploy/python/preprocess.py
index 1da32ad6e..89fe541ee 100644
--- a/deploy/python/preprocess.py
+++ b/deploy/python/preprocess.py
@@ -28,7 +28,7 @@ import numpy as np
import importlib
from PIL import Image
-from python.det_preprocess import DetNormalizeImage, DetPadStride, DetPermute, DetResize
+from .det_preprocess import DetNormalizeImage, DetPadStride, DetPermute, DetResize
def create_operators(params):
diff --git a/deploy/utils/config.py b/deploy/utils/config.py
index 7e7ffb79c..ba2888c11 100644
--- a/deploy/utils/config.py
+++ b/deploy/utils/config.py
@@ -17,7 +17,7 @@ import copy
import argparse
import yaml
-from utils import logger
+from . import logger
__all__ = ['get_config']
diff --git a/paddleclas.py b/paddleclas.py
index 3b45ca120..8d5e93a8b 100644
--- a/paddleclas.py
+++ b/paddleclas.py
@@ -16,7 +16,6 @@ import os
import sys
__dir__ = os.path.dirname(__file__)
sys.path.append(os.path.join(__dir__, ""))
-sys.path.append(os.path.join(__dir__, "deploy"))
from typing import Union, Generator
import argparse
@@ -33,12 +32,16 @@ from tqdm import tqdm
from prettytable import PrettyTable
import paddle
+import ppcls.arch.backbone as backbone
+from ppcls.utils import logger
+
from deploy.python.predict_cls import ClsPredictor
from deploy.utils.get_image_list import get_image_list
from deploy.utils import config
-import ppcls.arch.backbone as backbone
-from ppcls.utils import logger
+import deploy
+import ppcls
+# 'deploy.python', 'deploy.utils', 'ppcls.arch', 'ppcls.utils'
# for building model with loading pretrained weights from backbone
logger.init_logger()
diff --git a/setup.py b/setup.py
index c935136f4..3aaea708c 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ setup(
package_dir={'paddleclas': ''},
include_package_data=True,
entry_points={
- "console_scripts": ["paddleclas= paddleclas.paddleclas:main"]
+ "console_scripts": ["paddleclas=paddleclas.paddleclas:main"]
},
version='0.0.0',
install_requires=requirements,