From 3790f33f8861c80e190be18edac095d3cc64f270 Mon Sep 17 00:00:00 2001
From: littletomatodonkey <dazhiningsibuqu@163.com>
Date: Sat, 19 Sep 2020 06:32:49 +0000
Subject: [PATCH] fix python path

---
 tools/eval.py                 | 5 +++++
 tools/eval.sh                 | 2 --
 tools/eval_multi_platform.py  | 5 +++++
 tools/export_model.py         | 6 ++++++
 tools/export_serving_model.py | 5 +++++
 tools/infer/infer.py          | 8 ++++++--
 tools/run.sh                  | 2 --
 tools/train.py                | 5 +++++
 tools/train_multi_platform.py | 5 +++++
 9 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/tools/eval.py b/tools/eval.py
index 7aa370c6..768dc4b3 100644
--- a/tools/eval.py
+++ b/tools/eval.py
@@ -17,6 +17,11 @@ from __future__ import division
 from __future__ import print_function
 
 import os
+import sys
+__dir__ = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(__dir__)
+sys.path.append(os.path.abspath(os.path.join(__dir__, '../')))
+
 import argparse
 
 import paddle.fluid as fluid
diff --git a/tools/eval.sh b/tools/eval.sh
index 7da3ad4c..a86f56c8 100644
--- a/tools/eval.sh
+++ b/tools/eval.sh
@@ -1,5 +1,3 @@
-export PYTHONPATH=$PWD:$PYTHONPATH
-
 python -m paddle.distributed.launch \
     --selected_gpus="0" \
     tools/eval.py \
diff --git a/tools/eval_multi_platform.py b/tools/eval_multi_platform.py
index 90f87f7e..4083de6e 100644
--- a/tools/eval_multi_platform.py
+++ b/tools/eval_multi_platform.py
@@ -17,6 +17,11 @@ from __future__ import division
 from __future__ import print_function
 
 import os
+import sys
+__dir__ = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(__dir__)
+sys.path.append(os.path.abspath(os.path.join(__dir__, '../')))
+
 import argparse
 
 import paddle.fluid as fluid
diff --git a/tools/export_model.py b/tools/export_model.py
index 763ce473..c04c5018 100644
--- a/tools/export_model.py
+++ b/tools/export_model.py
@@ -12,6 +12,12 @@
 # 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(__dir__)
+sys.path.append(os.path.abspath(os.path.join(__dir__, '../')))
+
 import argparse
 
 from ppcls.modeling import architectures
diff --git a/tools/export_serving_model.py b/tools/export_serving_model.py
index e6e4472c..10632ecd 100644
--- a/tools/export_serving_model.py
+++ b/tools/export_serving_model.py
@@ -14,6 +14,11 @@
 
 import argparse
 import os
+import sys
+__dir__ = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(__dir__)
+sys.path.append(os.path.abspath(os.path.join(__dir__, '../')))
+
 from ppcls.modeling import architectures
 
 import paddle.fluid as fluid
diff --git a/tools/infer/infer.py b/tools/infer/infer.py
index 83c1fb4b..ec768fba 100644
--- a/tools/infer/infer.py
+++ b/tools/infer/infer.py
@@ -13,13 +13,17 @@
 # limitations under the License.
 
 import os
-import utils
+import sys
+__dir__ = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(__dir__)
+sys.path.append(os.path.abspath(os.path.join(__dir__, '../../')))
+
 import argparse
 import numpy as np
-
 import paddle.fluid as fluid
 
 from ppcls.modeling import architectures
+import utils
 
 
 def parse_args():
diff --git a/tools/run.sh b/tools/run.sh
index 5e8043b1..ad1e5448 100755
--- a/tools/run.sh
+++ b/tools/run.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-export PYTHONPATH=$PWD:$PYTHONPATH
-
 python -m paddle.distributed.launch \
     --selected_gpus="0,1,2,3" \
     tools/train.py \
diff --git a/tools/train.py b/tools/train.py
index 43c399fa..a9c58557 100644
--- a/tools/train.py
+++ b/tools/train.py
@@ -18,6 +18,11 @@ from __future__ import print_function
 
 import argparse
 import os
+import sys
+__dir__ = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(__dir__)
+sys.path.append(os.path.abspath(os.path.join(__dir__, '../')))
+
 from sys import version_info
 
 import paddle.fluid as fluid
diff --git a/tools/train_multi_platform.py b/tools/train_multi_platform.py
index 0b1ea2c1..44770393 100644
--- a/tools/train_multi_platform.py
+++ b/tools/train_multi_platform.py
@@ -18,6 +18,11 @@ from __future__ import print_function
 
 import argparse
 import os
+import sys
+__dir__ = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(__dir__)
+sys.path.append(os.path.abspath(os.path.join(__dir__, '../')))
+
 from sys import version_info
 
 import paddle.fluid as fluid
-- 
GitLab