diff --git a/paddlex/__init__.py b/paddlex/__init__.py index 0bc80a6f29b581917939269f5e471c9685a1a693..96650dbb5be87bb12642327b39339f98cd70fba8 100644 --- a/paddlex/__init__.py +++ b/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' diff --git a/paddlex/interpret/core/_session_preparation.py b/paddlex/interpret/core/_session_preparation.py index e213da1c1ec447bfb57640f165c131b9f17cd9b3..3935338b540127efe0cfdd0349706ba19b1a6a0f 100644 --- a/paddlex/interpret/core/_session_preparation.py +++ b/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] \ No newline at end of file + return result[0][0] diff --git a/paddlex/interpret/core/interpretation_algorithms.py b/paddlex/interpret/core/interpretation_algorithms.py index 601a96db1e7562179e0c73aabff85421f97a518e..eafb4850f5141dc86507fa12f0a345da8d713993 100644 --- a/paddlex/interpret/core/interpretation_algorithms.py +++ b/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 diff --git a/paddlex/interpret/core/normlime_base.py b/paddlex/interpret/core/normlime_base.py index 75f1e920c479cc060e8963ffb5710bf4c8ca57fa..c1ae902f33a39a3488bf6e9fd5035c295e4ac45f 100644 --- a/paddlex/interpret/core/normlime_base.py +++ b/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