From 5371442786c61bafe166ed3486f8f9d767bcb2af Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 8 Sep 2020 22:55:37 -0400 Subject: [PATCH] Fixes model_zoo with minddata API change --- mindspore/dataset/vision/c_transforms.py | 2 +- model_zoo/official/cv/alexnet/src/dataset.py | 2 +- model_zoo/official/cv/faster_rcnn/src/dataset.py | 2 +- model_zoo/official/cv/googlenet/src/dataset.py | 2 +- model_zoo/official/cv/inceptionv3/src/dataset.py | 2 +- model_zoo/official/cv/lenet/src/dataset.py | 4 ++-- model_zoo/official/cv/lenet_quant/src/dataset.py | 4 ++-- model_zoo/official/cv/maskrcnn/src/dataset.py | 2 +- model_zoo/official/cv/mobilenetv2/src/dataset.py | 2 +- model_zoo/official/cv/mobilenetv2_quant/src/dataset.py | 6 +++--- model_zoo/official/cv/mobilenetv3/src/dataset.py | 2 +- model_zoo/official/cv/nasnet/src/dataset.py | 2 +- model_zoo/official/cv/resnet/src/dataset.py | 2 +- model_zoo/official/cv/resnet50_quant/src/dataset.py | 6 +++--- model_zoo/official/cv/resnet_thor/src/dataset.py | 2 +- model_zoo/official/cv/resnext50/src/dataset.py | 2 +- model_zoo/official/cv/shufflenetv2/src/dataset.py | 2 +- model_zoo/official/cv/ssd/src/dataset.py | 2 +- model_zoo/official/cv/vgg16/src/dataset.py | 2 +- model_zoo/official/cv/warpctc/src/dataset.py | 2 +- model_zoo/official/cv/yolov3_darknet53/src/yolo_dataset.py | 2 +- .../official/cv/yolov3_darknet53_quant/src/yolo_dataset.py | 2 +- model_zoo/official/cv/yolov3_resnet18/src/dataset.py | 2 +- 23 files changed, 29 insertions(+), 29 deletions(-) diff --git a/mindspore/dataset/vision/c_transforms.py b/mindspore/dataset/vision/c_transforms.py index 9dd186a04..25e962537 100644 --- a/mindspore/dataset/vision/c_transforms.py +++ b/mindspore/dataset/vision/c_transforms.py @@ -26,7 +26,7 @@ to improve their training models. >>> import mindspore.dataset as ds >>> import mindspore.dataset.transforms.c_transforms as c_transforms >>> import mindspore.dataset.vision.c_transforms as c_vision - >>> from mindspore.dataset.transforms.vision.utils import Border, ImageBatchFormat, Inter + >>> from mindspore.dataset.vision.utils import Border, ImageBatchFormat, Inter >>> dataset_dir = "path/to/imagefolder_directory" >>> # create a dataset that reads all files in dataset_dir with 8 threads diff --git a/model_zoo/official/cv/alexnet/src/dataset.py b/model_zoo/official/cv/alexnet/src/dataset.py index 651c76d6e..688b6fa67 100644 --- a/model_zoo/official/cv/alexnet/src/dataset.py +++ b/model_zoo/official/cv/alexnet/src/dataset.py @@ -18,7 +18,7 @@ Produce the dataset import mindspore.dataset as ds import mindspore.dataset.transforms.c_transforms as C -import mindspore.dataset.transforms.vision.c_transforms as CV +import mindspore.dataset.vision.c_transforms as CV from mindspore.common import dtype as mstype from .config import alexnet_cfg as cfg diff --git a/model_zoo/official/cv/faster_rcnn/src/dataset.py b/model_zoo/official/cv/faster_rcnn/src/dataset.py index 47dd80045..fd221cedd 100644 --- a/model_zoo/official/cv/faster_rcnn/src/dataset.py +++ b/model_zoo/official/cv/faster_rcnn/src/dataset.py @@ -22,7 +22,7 @@ from numpy import random import mmcv import mindspore.dataset as de -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C import mindspore.dataset.transforms.c_transforms as CC import mindspore.common.dtype as mstype from mindspore.mindrecord import FileWriter diff --git a/model_zoo/official/cv/googlenet/src/dataset.py b/model_zoo/official/cv/googlenet/src/dataset.py index cc33d2e59..771624c58 100644 --- a/model_zoo/official/cv/googlenet/src/dataset.py +++ b/model_zoo/official/cv/googlenet/src/dataset.py @@ -20,7 +20,7 @@ import os import mindspore.common.dtype as mstype import mindspore.dataset as ds import mindspore.dataset.transforms.c_transforms as C -import mindspore.dataset.transforms.vision.c_transforms as vision +import mindspore.dataset.vision.c_transforms as vision from src.config import cifar_cfg as cfg diff --git a/model_zoo/official/cv/inceptionv3/src/dataset.py b/model_zoo/official/cv/inceptionv3/src/dataset.py index 113ad5690..6ed7175b4 100644 --- a/model_zoo/official/cv/inceptionv3/src/dataset.py +++ b/model_zoo/official/cv/inceptionv3/src/dataset.py @@ -18,7 +18,7 @@ Data operations, will be used in train.py and eval.py import mindspore.common.dtype as mstype import mindspore.dataset.engine as de import mindspore.dataset.transforms.c_transforms as C2 -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C from src.config import config_gpu as cfg diff --git a/model_zoo/official/cv/lenet/src/dataset.py b/model_zoo/official/cv/lenet/src/dataset.py index cef697348..dca3a6af8 100644 --- a/model_zoo/official/cv/lenet/src/dataset.py +++ b/model_zoo/official/cv/lenet/src/dataset.py @@ -17,9 +17,9 @@ Produce the dataset """ import mindspore.dataset as ds -import mindspore.dataset.transforms.vision.c_transforms as CV +import mindspore.dataset.vision.c_transforms as CV import mindspore.dataset.transforms.c_transforms as C -from mindspore.dataset.transforms.vision import Inter +from mindspore.dataset.vision import Inter from mindspore.common import dtype as mstype diff --git a/model_zoo/official/cv/lenet_quant/src/dataset.py b/model_zoo/official/cv/lenet_quant/src/dataset.py index cef697348..dca3a6af8 100644 --- a/model_zoo/official/cv/lenet_quant/src/dataset.py +++ b/model_zoo/official/cv/lenet_quant/src/dataset.py @@ -17,9 +17,9 @@ Produce the dataset """ import mindspore.dataset as ds -import mindspore.dataset.transforms.vision.c_transforms as CV +import mindspore.dataset.vision.c_transforms as CV import mindspore.dataset.transforms.c_transforms as C -from mindspore.dataset.transforms.vision import Inter +from mindspore.dataset.vision import Inter from mindspore.common import dtype as mstype diff --git a/model_zoo/official/cv/maskrcnn/src/dataset.py b/model_zoo/official/cv/maskrcnn/src/dataset.py index 2330d81a5..090e32727 100644 --- a/model_zoo/official/cv/maskrcnn/src/dataset.py +++ b/model_zoo/official/cv/maskrcnn/src/dataset.py @@ -22,7 +22,7 @@ from numpy import random import mmcv import mindspore.dataset as de -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C from mindspore.mindrecord import FileWriter from src.config import config import cv2 diff --git a/model_zoo/official/cv/mobilenetv2/src/dataset.py b/model_zoo/official/cv/mobilenetv2/src/dataset.py index 7e546991e..377417618 100644 --- a/model_zoo/official/cv/mobilenetv2/src/dataset.py +++ b/model_zoo/official/cv/mobilenetv2/src/dataset.py @@ -23,7 +23,7 @@ from mindspore import Tensor from mindspore.train.model import Model import mindspore.common.dtype as mstype import mindspore.dataset.engine as de -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C import mindspore.dataset.transforms.c_transforms as C2 diff --git a/model_zoo/official/cv/mobilenetv2_quant/src/dataset.py b/model_zoo/official/cv/mobilenetv2_quant/src/dataset.py index 67c48c765..431181a96 100644 --- a/model_zoo/official/cv/mobilenetv2_quant/src/dataset.py +++ b/model_zoo/official/cv/mobilenetv2_quant/src/dataset.py @@ -19,9 +19,9 @@ import os from functools import partial import mindspore.common.dtype as mstype import mindspore.dataset.engine as de -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C import mindspore.dataset.transforms.c_transforms as C2 -import mindspore.dataset.transforms.py_transforms +import mindspore.dataset.transforms.py_transforms as P2 import mindspore.dataset.vision.py_transforms as P @@ -150,7 +150,7 @@ def create_dataset_py(dataset_path, do_train, config, device_target, repeat_num= else: trans = [decode_op, resize_op, center_crop, to_tensor, normalize_op] - compose = mindspore.dataset.transforms.py_transforms.Compose(trans) + compose = P2.Compose(trans) ds = ds.map(input_columns="image", operations=compose, num_parallel_workers=8, python_multiprocessing=True) diff --git a/model_zoo/official/cv/mobilenetv3/src/dataset.py b/model_zoo/official/cv/mobilenetv3/src/dataset.py index 7b1a35505..1bd647c19 100644 --- a/model_zoo/official/cv/mobilenetv3/src/dataset.py +++ b/model_zoo/official/cv/mobilenetv3/src/dataset.py @@ -17,7 +17,7 @@ create train or eval dataset. """ import mindspore.common.dtype as mstype import mindspore.dataset.engine as de -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C import mindspore.dataset.transforms.c_transforms as C2 diff --git a/model_zoo/official/cv/nasnet/src/dataset.py b/model_zoo/official/cv/nasnet/src/dataset.py index 338640824..0b342ba09 100755 --- a/model_zoo/official/cv/nasnet/src/dataset.py +++ b/model_zoo/official/cv/nasnet/src/dataset.py @@ -18,7 +18,7 @@ Data operations, will be used in train.py and eval.py import mindspore.common.dtype as mstype import mindspore.dataset.engine as de import mindspore.dataset.transforms.c_transforms as C2 -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C def create_dataset(dataset_path, config, do_train, repeat_num=1): diff --git a/model_zoo/official/cv/resnet/src/dataset.py b/model_zoo/official/cv/resnet/src/dataset.py index 13c5a76dc..c9252834f 100755 --- a/model_zoo/official/cv/resnet/src/dataset.py +++ b/model_zoo/official/cv/resnet/src/dataset.py @@ -18,7 +18,7 @@ create train or eval dataset. import os import mindspore.common.dtype as mstype import mindspore.dataset.engine as de -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C import mindspore.dataset.transforms.c_transforms as C2 from mindspore.communication.management import init, get_rank, get_group_size diff --git a/model_zoo/official/cv/resnet50_quant/src/dataset.py b/model_zoo/official/cv/resnet50_quant/src/dataset.py index 5de7688f3..605543ec1 100755 --- a/model_zoo/official/cv/resnet50_quant/src/dataset.py +++ b/model_zoo/official/cv/resnet50_quant/src/dataset.py @@ -19,9 +19,9 @@ import os from functools import partial import mindspore.common.dtype as mstype import mindspore.dataset.engine as de -import mindspore.dataset.transforms.vision.c_transforms as C import mindspore.dataset.transforms.c_transforms as C2 -import mindspore.dataset.transforms.py_transforms +import mindspore.dataset.vision.c_transforms as C +import mindspore.dataset.transforms.py_transforms as P2 import mindspore.dataset.vision.py_transforms as P from mindspore.communication.management import init, get_rank, get_group_size from src.config import config_quant @@ -146,7 +146,7 @@ def create_dataset_py(dataset_path, do_train, repeat_num=1, batch_size=32, targe else: trans = [decode_op, resize_op, center_crop, to_tensor, normalize_op] - compose = mindspore.dataset.transforms.py_transforms.Compose(trans) + compose = P2.Compose(trans) ds = ds.map(input_columns="image", operations=compose, num_parallel_workers=8, python_multiprocessing=True) # apply batch operations diff --git a/model_zoo/official/cv/resnet_thor/src/dataset.py b/model_zoo/official/cv/resnet_thor/src/dataset.py index d9df510c1..69ecf19c4 100644 --- a/model_zoo/official/cv/resnet_thor/src/dataset.py +++ b/model_zoo/official/cv/resnet_thor/src/dataset.py @@ -18,7 +18,7 @@ create train or eval dataset. import os import mindspore.common.dtype as mstype import mindspore.dataset.engine as de -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C import mindspore.dataset.transforms.c_transforms as C2 from mindspore.communication.management import init, get_rank, get_group_size diff --git a/model_zoo/official/cv/resnext50/src/dataset.py b/model_zoo/official/cv/resnext50/src/dataset.py index fd4f15f01..e8640e8c1 100644 --- a/model_zoo/official/cv/resnext50/src/dataset.py +++ b/model_zoo/official/cv/resnext50/src/dataset.py @@ -19,7 +19,7 @@ import os from mindspore.common import dtype as mstype import mindspore.dataset as de import mindspore.dataset.transforms.c_transforms as C -import mindspore.dataset.transforms.vision.c_transforms as V_C +import mindspore.dataset.vision.c_transforms as V_C from PIL import Image, ImageFile from src.utils.sampler import DistributedSampler diff --git a/model_zoo/official/cv/shufflenetv2/src/dataset.py b/model_zoo/official/cv/shufflenetv2/src/dataset.py index 13169c107..10f5a8066 100644 --- a/model_zoo/official/cv/shufflenetv2/src/dataset.py +++ b/model_zoo/official/cv/shufflenetv2/src/dataset.py @@ -21,7 +21,7 @@ from src.config import config_gpu as cfg import mindspore.common.dtype as mstype import mindspore.dataset.engine as de import mindspore.dataset.transforms.c_transforms as C2 -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C class toBGR(): diff --git a/model_zoo/official/cv/ssd/src/dataset.py b/model_zoo/official/cv/ssd/src/dataset.py index 21269a7d4..4ff66d30d 100644 --- a/model_zoo/official/cv/ssd/src/dataset.py +++ b/model_zoo/official/cv/ssd/src/dataset.py @@ -24,7 +24,7 @@ import numpy as np import cv2 import mindspore.dataset as de -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C from mindspore.mindrecord import FileWriter from .config import config from .box_utils import jaccard_numpy, ssd_bboxes_encode diff --git a/model_zoo/official/cv/vgg16/src/dataset.py b/model_zoo/official/cv/vgg16/src/dataset.py index 0f6d53889..ce1968645 100644 --- a/model_zoo/official/cv/vgg16/src/dataset.py +++ b/model_zoo/official/cv/vgg16/src/dataset.py @@ -19,7 +19,7 @@ import os from mindspore.common import dtype as mstype import mindspore.dataset as de import mindspore.dataset.transforms.c_transforms as C -import mindspore.dataset.transforms.vision.c_transforms as vision +import mindspore.dataset.vision.c_transforms as vision from PIL import Image, ImageFile from src.utils.sampler import DistributedSampler diff --git a/model_zoo/official/cv/warpctc/src/dataset.py b/model_zoo/official/cv/warpctc/src/dataset.py index 784bb4d84..defa96304 100755 --- a/model_zoo/official/cv/warpctc/src/dataset.py +++ b/model_zoo/official/cv/warpctc/src/dataset.py @@ -19,7 +19,7 @@ import numpy as np import mindspore.common.dtype as mstype import mindspore.dataset.engine as de import mindspore.dataset.transforms.c_transforms as c -import mindspore.dataset.transforms.vision.c_transforms as vc +import mindspore.dataset.vision.c_transforms as vc from PIL import Image from src.config import config as cf diff --git a/model_zoo/official/cv/yolov3_darknet53/src/yolo_dataset.py b/model_zoo/official/cv/yolov3_darknet53/src/yolo_dataset.py index 947ab6136..b56a1fc40 100644 --- a/model_zoo/official/cv/yolov3_darknet53/src/yolo_dataset.py +++ b/model_zoo/official/cv/yolov3_darknet53/src/yolo_dataset.py @@ -19,7 +19,7 @@ import multiprocessing from PIL import Image from pycocotools.coco import COCO import mindspore.dataset as de -import mindspore.dataset.transforms.vision.c_transforms as CV +import mindspore.dataset.vision.c_transforms as CV from src.distributed_sampler import DistributedSampler from src.transforms import reshape_fn, MultiScaleTrans diff --git a/model_zoo/official/cv/yolov3_darknet53_quant/src/yolo_dataset.py b/model_zoo/official/cv/yolov3_darknet53_quant/src/yolo_dataset.py index af376e43c..59b423ad9 100644 --- a/model_zoo/official/cv/yolov3_darknet53_quant/src/yolo_dataset.py +++ b/model_zoo/official/cv/yolov3_darknet53_quant/src/yolo_dataset.py @@ -18,7 +18,7 @@ import os from PIL import Image from pycocotools.coco import COCO import mindspore.dataset as de -import mindspore.dataset.transforms.vision.c_transforms as CV +import mindspore.dataset.vision.c_transforms as CV from src.distributed_sampler import DistributedSampler from src.transforms import reshape_fn, MultiScaleTrans diff --git a/model_zoo/official/cv/yolov3_resnet18/src/dataset.py b/model_zoo/official/cv/yolov3_resnet18/src/dataset.py index 0bfcc74bf..36ef978b0 100644 --- a/model_zoo/official/cv/yolov3_resnet18/src/dataset.py +++ b/model_zoo/official/cv/yolov3_resnet18/src/dataset.py @@ -22,7 +22,7 @@ from matplotlib.colors import rgb_to_hsv, hsv_to_rgb from PIL import Image import mindspore.dataset as de from mindspore.mindrecord import FileWriter -import mindspore.dataset.transforms.vision.c_transforms as C +import mindspore.dataset.vision.c_transforms as C from src.config import ConfigYOLOV3ResNet18 iter_cnt = 0 -- GitLab