Merge branch 'develop' of https://github.com/PaddlePaddle/PaddleX into develop

paddlex/__init__.py

@@ -29,7 +29,6 @@ from . import cls
 from . import slim
 from . import convertor
 from . import tools
-from . import interpret
 from . import deploy
 
 try:
@@ -51,4 +50,7 @@ load_model = cv.models.load_model
 datasets = cv.datasets
 
 log_level = 2
+
+from . import interpret
+
 __version__ = '0.2.0.github'

paddlex/interpret/core/_session_preparation.py

@@ -18,7 +18,7 @@ import paddle.fluid as fluid
 import paddlex as pdx
 import numpy as np
 from paddle.fluid.param_attr import ParamAttr
-from ..as_data_reader.readers import preprocess_image
+from paddlex.interpret.as_data_reader.readers import preprocess_image
 
 def gen_user_home():
     if "HOME" in os.environ:
@@ -125,4 +125,4 @@ def compute_features_for_kmeans(data_content):
     images = preprocess_image(data_content)  # transpose to [N, 3, H, W], scaled to [0.0, 1.0]
     result = exe.run(prog, fetch_list=[resized_features], feed={'image': images})
 
-    return result[0][0]
+    return result[0][0]
\ No newline at end of file

paddlex/interpret/core/interpretation_algorithms.py

@@ -17,9 +17,10 @@ import numpy as np
 import time
 
 from . import lime_base
-from ..as_data_reader.readers import read_image
 from ._session_preparation import paddle_get_fc_weights, compute_features_for_kmeans, h_pre_models_kmeans
 from .normlime_base import combine_normlime_and_lime, get_feature_for_kmeans, load_kmeans_model
+from paddlex.interpret.as_data_reader.readers import read_image
+
 
 import cv2
 

paddlex/interpret/core/normlime_base.py

@@ -16,7 +16,7 @@ import os
 import numpy as np
 import glob
 
-from ..as_data_reader.readers import read_image
+from paddlex.interpret.as_data_reader.readers import read_image
 from . import lime_base
 from ._session_preparation import compute_features_for_kmeans, h_pre_models_kmeans