From 14285daa726e376443b3c33e8e23199e0607e0ab Mon Sep 17 00:00:00 2001 From: whs Date: Fri, 28 Sep 2018 14:43:20 +0800 Subject: [PATCH] Remove paddle.v2 from models. (#1312) --- fluid/DeepASR/model_utils/model.py | 1 - fluid/adversarial/tutorials/mnist_model.py | 2 +- fluid/adversarial/tutorials/mnist_tutorial_bim.py | 2 +- fluid/adversarial/tutorials/mnist_tutorial_deepfool.py | 2 +- fluid/adversarial/tutorials/mnist_tutorial_fgsm.py | 2 +- fluid/adversarial/tutorials/mnist_tutorial_ilcm.py | 2 +- fluid/adversarial/tutorials/mnist_tutorial_jsma.py | 2 +- fluid/adversarial/tutorials/mnist_tutorial_lbfgs.py | 2 +- fluid/adversarial/tutorials/mnist_tutorial_mifgsm.py | 2 +- fluid/icnet/infer.py | 6 +++--- .../caffe2fluid/examples/mnist/evaluate.py | 2 +- fluid/metric_learning/losses/datareader.py | 1 - fluid/ocr_recognition/eval.py | 1 - fluid/ocr_recognition/infer.py | 1 - fluid/policy_gradient/brain.py | 1 - fluid/video_classification/eval.py | 2 +- fluid/video_classification/infer.py | 2 +- fluid/video_classification/reader.py | 2 +- fluid/video_classification/train.py | 2 +- 19 files changed, 16 insertions(+), 21 deletions(-) diff --git a/fluid/DeepASR/model_utils/model.py b/fluid/DeepASR/model_utils/model.py index 8ae7e66f..31892a7a 100644 --- a/fluid/DeepASR/model_utils/model.py +++ b/fluid/DeepASR/model_utils/model.py @@ -2,7 +2,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import paddle.v2 as paddle import paddle.fluid as fluid diff --git a/fluid/adversarial/tutorials/mnist_model.py b/fluid/adversarial/tutorials/mnist_model.py index 81ff7bde..b1ebb0f8 100644 --- a/fluid/adversarial/tutorials/mnist_model.py +++ b/fluid/adversarial/tutorials/mnist_model.py @@ -1,7 +1,7 @@ """ CNN on mnist data using fluid api of paddlepaddle """ -import paddle.v2 as paddle +import paddle import paddle.fluid as fluid diff --git a/fluid/adversarial/tutorials/mnist_tutorial_bim.py b/fluid/adversarial/tutorials/mnist_tutorial_bim.py index b490eba3..0524b908 100644 --- a/fluid/adversarial/tutorials/mnist_tutorial_bim.py +++ b/fluid/adversarial/tutorials/mnist_tutorial_bim.py @@ -8,7 +8,7 @@ sys.path.append("..") import matplotlib.pyplot as plt import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle from advbox.adversary import Adversary from advbox.attacks.gradient_method import BIM diff --git a/fluid/adversarial/tutorials/mnist_tutorial_deepfool.py b/fluid/adversarial/tutorials/mnist_tutorial_deepfool.py index 2b12c819..74ab5e80 100644 --- a/fluid/adversarial/tutorials/mnist_tutorial_deepfool.py +++ b/fluid/adversarial/tutorials/mnist_tutorial_deepfool.py @@ -8,7 +8,7 @@ sys.path.append("..") import matplotlib.pyplot as plt import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle from advbox.adversary import Adversary from advbox.attacks.deepfool import DeepFoolAttack diff --git a/fluid/adversarial/tutorials/mnist_tutorial_fgsm.py b/fluid/adversarial/tutorials/mnist_tutorial_fgsm.py index eeb7bc47..178fc146 100644 --- a/fluid/adversarial/tutorials/mnist_tutorial_fgsm.py +++ b/fluid/adversarial/tutorials/mnist_tutorial_fgsm.py @@ -8,7 +8,7 @@ sys.path.append("..") import matplotlib.pyplot as plt import numpy as np import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle from advbox.adversary import Adversary from advbox.attacks.gradient_method import FGSM diff --git a/fluid/adversarial/tutorials/mnist_tutorial_ilcm.py b/fluid/adversarial/tutorials/mnist_tutorial_ilcm.py index 3d155e58..b12ffaab 100644 --- a/fluid/adversarial/tutorials/mnist_tutorial_ilcm.py +++ b/fluid/adversarial/tutorials/mnist_tutorial_ilcm.py @@ -7,7 +7,7 @@ sys.path.append("..") import matplotlib.pyplot as plt import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle from advbox.adversary import Adversary from advbox.attacks.gradient_method import ILCM diff --git a/fluid/adversarial/tutorials/mnist_tutorial_jsma.py b/fluid/adversarial/tutorials/mnist_tutorial_jsma.py index 070d2f5f..98829ec3 100644 --- a/fluid/adversarial/tutorials/mnist_tutorial_jsma.py +++ b/fluid/adversarial/tutorials/mnist_tutorial_jsma.py @@ -7,7 +7,7 @@ sys.path.append("..") import matplotlib.pyplot as plt import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle from advbox.adversary import Adversary from advbox.attacks.saliency import JSMA diff --git a/fluid/adversarial/tutorials/mnist_tutorial_lbfgs.py b/fluid/adversarial/tutorials/mnist_tutorial_lbfgs.py index 9b16c32b..ba120d9d 100644 --- a/fluid/adversarial/tutorials/mnist_tutorial_lbfgs.py +++ b/fluid/adversarial/tutorials/mnist_tutorial_lbfgs.py @@ -7,7 +7,7 @@ sys.path.append("..") import matplotlib.pyplot as plt import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle from advbox.adversary import Adversary from advbox.attacks.lbfgs import LBFGS diff --git a/fluid/adversarial/tutorials/mnist_tutorial_mifgsm.py b/fluid/adversarial/tutorials/mnist_tutorial_mifgsm.py index ded7ef4b..8fc84db8 100644 --- a/fluid/adversarial/tutorials/mnist_tutorial_mifgsm.py +++ b/fluid/adversarial/tutorials/mnist_tutorial_mifgsm.py @@ -9,7 +9,7 @@ sys.path.append("..") import matplotlib.pyplot as plt import numpy as np import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle from advbox.adversary import Adversary from advbox.attacks.gradient_method import MIFGSM diff --git a/fluid/icnet/infer.py b/fluid/icnet/infer.py index f93469f1..9f556fc0 100644 --- a/fluid/icnet/infer.py +++ b/fluid/icnet/infer.py @@ -8,7 +8,7 @@ import os import cv2 import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle from icnet import icnet from utils import add_arguments, print_arguments, get_feeder_data from paddle.fluid.layers.learning_rate_scheduler import _decay_step_counter @@ -111,10 +111,10 @@ def infer(args): for line in open(args.images_list): image_file = args.images_path + "/" + line.strip() filename = os.path.basename(image_file) - image = paddle.image.load_image( + image = paddle.dataset.image.load_image( image_file, is_color=True).astype("float32") image -= IMG_MEAN - img = paddle.image.to_chw(image)[np.newaxis, :] + img = paddle.dataset.image.to_chw(image)[np.newaxis, :] image_t = fluid.core.LoDTensor() image_t.set(img, place) result = exe.run(inference_program, diff --git a/fluid/image_classification/caffe2fluid/examples/mnist/evaluate.py b/fluid/image_classification/caffe2fluid/examples/mnist/evaluate.py index 946fa943..55b053e8 100644 --- a/fluid/image_classification/caffe2fluid/examples/mnist/evaluate.py +++ b/fluid/image_classification/caffe2fluid/examples/mnist/evaluate.py @@ -8,7 +8,7 @@ import sys import os import numpy as np import paddle.fluid as fluid -import paddle.v2 as paddle +import paddle def test_model(exe, test_program, fetch_list, test_reader, feeder): diff --git a/fluid/metric_learning/losses/datareader.py b/fluid/metric_learning/losses/datareader.py index 97c401e5..c3f04eb9 100644 --- a/fluid/metric_learning/losses/datareader.py +++ b/fluid/metric_learning/losses/datareader.py @@ -4,7 +4,6 @@ import random import cPickle import functools import numpy as np -#import paddle.v2 as paddle import paddle from PIL import Image, ImageEnhance diff --git a/fluid/ocr_recognition/eval.py b/fluid/ocr_recognition/eval.py index 1d553999..a19ca4a3 100644 --- a/fluid/ocr_recognition/eval.py +++ b/fluid/ocr_recognition/eval.py @@ -1,4 +1,3 @@ -import paddle.v2 as paddle import paddle.fluid as fluid from utility import add_arguments, print_arguments, to_lodtensor, get_ctc_feeder_data, get_attention_feeder_data from attention_model import attention_eval diff --git a/fluid/ocr_recognition/infer.py b/fluid/ocr_recognition/infer.py index 6a28314d..5c3e1f24 100755 --- a/fluid/ocr_recognition/infer.py +++ b/fluid/ocr_recognition/infer.py @@ -1,5 +1,4 @@ from __future__ import print_function -import paddle.v2 as paddle import paddle.fluid as fluid from utility import add_arguments, print_arguments, to_lodtensor, get_ctc_feeder_data, get_attention_feeder_for_infer import paddle.fluid.profiler as profiler diff --git a/fluid/policy_gradient/brain.py b/fluid/policy_gradient/brain.py index 314aec52..27a2da28 100644 --- a/fluid/policy_gradient/brain.py +++ b/fluid/policy_gradient/brain.py @@ -1,5 +1,4 @@ import numpy as np -import paddle.v2 as paddle import paddle.fluid as fluid # reproducible np.random.seed(1) diff --git a/fluid/video_classification/eval.py b/fluid/video_classification/eval.py index 91b8d445..130e682c 100644 --- a/fluid/video_classification/eval.py +++ b/fluid/video_classification/eval.py @@ -2,7 +2,7 @@ import os import numpy as np import time import sys -import paddle.v2 as paddle +import paddle import paddle.fluid as fluid from resnet import TSN_ResNet import reader diff --git a/fluid/video_classification/infer.py b/fluid/video_classification/infer.py index 1f3048b1..15cc2b53 100644 --- a/fluid/video_classification/infer.py +++ b/fluid/video_classification/infer.py @@ -2,7 +2,7 @@ import os import numpy as np import time import sys -import paddle.v2 as paddle +import paddle import paddle.fluid as fluid from resnet import TSN_ResNet import reader diff --git a/fluid/video_classification/reader.py b/fluid/video_classification/reader.py index e688b664..11cfaa5b 100644 --- a/fluid/video_classification/reader.py +++ b/fluid/video_classification/reader.py @@ -5,7 +5,7 @@ import functools import cPickle from cStringIO import StringIO import numpy as np -import paddle.v2 as paddle +import paddle from PIL import Image, ImageEnhance random.seed(0) diff --git a/fluid/video_classification/train.py b/fluid/video_classification/train.py index a4171b2f..c879bf68 100644 --- a/fluid/video_classification/train.py +++ b/fluid/video_classification/train.py @@ -2,7 +2,7 @@ import os import numpy as np import time import sys -import paddle.v2 as paddle +import paddle import paddle.fluid as fluid from resnet import TSN_ResNet import reader -- GitLab