From 1e8a020f2b1324901085f9528c47508500bfbf06 Mon Sep 17 00:00:00 2001 From: cuicheng01 Date: Wed, 2 Jun 2021 10:57:38 +0000 Subject: [PATCH] fix bug of image transforms --- ppcls/configs/ImageNet/HRNet/HRNet_W18_C.yaml | 2 ++ ppcls/configs/ImageNet/HRNet/HRNet_W30_C.yaml | 2 ++ ppcls/configs/ImageNet/HRNet/HRNet_W32_C.yaml | 2 ++ ppcls/configs/ImageNet/HRNet/HRNet_W40_C.yaml | 2 ++ ppcls/configs/ImageNet/HRNet/HRNet_W48_C.yaml | 2 -- ppcls/configs/ImageNet/HRNet/HRNet_W64_C.yaml | 2 ++ ppcls/configs/ImageNet/Ineption/InceptionV3.yaml | 4 +++- ppcls/configs/ImageNet/MobileNetV1/MobileNetV1.yaml | 2 ++ ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_25.yaml | 2 ++ ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_5.yaml | 2 ++ ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_75.yaml | 2 ++ .../ImageNet/MobileNetV3/MobileNetV3_large_x0_35.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_large_x0_5.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_large_x0_75.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_large_x1_25.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_small_x0_35.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_small_x0_5.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_small_x0_75.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_small_x1_0.yaml | 3 +++ .../ImageNet/MobileNetV3/MobileNetV3_small_x1_25.yaml | 3 +++ ppcls/configs/ImageNet/ResNet/ResNet101.yaml | 2 ++ ppcls/configs/ImageNet/ResNet/ResNet101_vd.yaml | 2 ++ ppcls/configs/ImageNet/ResNet/ResNet152.yaml | 2 ++ ppcls/configs/ImageNet/ResNet/ResNet152_vd.yaml | 2 ++ ppcls/configs/ImageNet/ResNet/ResNet18.yaml | 2 ++ ppcls/configs/ImageNet/ResNet/ResNet18_vd.yaml | 2 ++ ppcls/configs/ImageNet/ResNet/ResNet200_vd.yaml | 2 ++ ppcls/configs/ImageNet/ResNet/ResNet34.yaml | 2 ++ ppcls/configs/ImageNet/ResNet/ResNet34_vd.yaml | 4 +++- ppcls/configs/ImageNet/ResNet/ResNet50.yaml | 4 +++- ppcls/configs/ImageNet/ResNet/ResNet50_vd.yaml | 2 ++ ppcls/configs/ImageNet/VGG/VGG11.yaml | 2 ++ ppcls/configs/ImageNet/VGG/VGG13.yaml | 2 ++ ppcls/configs/ImageNet/VGG/VGG16.yaml | 2 ++ ppcls/configs/ImageNet/VGG/VGG19.yaml | 2 ++ ppcls/data/dataset/imagenet_dataset.py | 7 ++++++- 37 files changed, 89 insertions(+), 6 deletions(-) diff --git a/ppcls/configs/ImageNet/HRNet/HRNet_W18_C.yaml b/ppcls/configs/ImageNet/HRNet/HRNet_W18_C.yaml index a5e67741..8d1e6081 100644 --- a/ppcls/configs/ImageNet/HRNet/HRNet_W18_C.yaml +++ b/ppcls/configs/ImageNet/HRNet/HRNet_W18_C.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/HRNet/HRNet_W30_C.yaml b/ppcls/configs/ImageNet/HRNet/HRNet_W30_C.yaml index 50bd7144..dbcbe636 100644 --- a/ppcls/configs/ImageNet/HRNet/HRNet_W30_C.yaml +++ b/ppcls/configs/ImageNet/HRNet/HRNet_W30_C.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/HRNet/HRNet_W32_C.yaml b/ppcls/configs/ImageNet/HRNet/HRNet_W32_C.yaml index 62129ae8..baac1a32 100644 --- a/ppcls/configs/ImageNet/HRNet/HRNet_W32_C.yaml +++ b/ppcls/configs/ImageNet/HRNet/HRNet_W32_C.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/HRNet/HRNet_W40_C.yaml b/ppcls/configs/ImageNet/HRNet/HRNet_W40_C.yaml index f9af0c42..84512b02 100644 --- a/ppcls/configs/ImageNet/HRNet/HRNet_W40_C.yaml +++ b/ppcls/configs/ImageNet/HRNet/HRNet_W40_C.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/HRNet/HRNet_W48_C.yaml b/ppcls/configs/ImageNet/HRNet/HRNet_W48_C.yaml index 51c796cf..d743663d 100644 --- a/ppcls/configs/ImageNet/HRNet/HRNet_W48_C.yaml +++ b/ppcls/configs/ImageNet/HRNet/HRNet_W48_C.yaml @@ -76,8 +76,6 @@ DataLoader: image_root: "./dataset/ILSVRC2012/" cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - - ResizeImage: - size: 224 - NormalizeImage: scale: 0.00392157 mean: [0.485, 0.456, 0.406] diff --git a/ppcls/configs/ImageNet/HRNet/HRNet_W64_C.yaml b/ppcls/configs/ImageNet/HRNet/HRNet_W64_C.yaml index 00c9fff9..5af7712c 100644 --- a/ppcls/configs/ImageNet/HRNet/HRNet_W64_C.yaml +++ b/ppcls/configs/ImageNet/HRNet/HRNet_W64_C.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/Ineption/InceptionV3.yaml b/ppcls/configs/ImageNet/Ineption/InceptionV3.yaml index 66607f76..d04bc319 100644 --- a/ppcls/configs/ImageNet/Ineption/InceptionV3.yaml +++ b/ppcls/configs/ImageNet/Ineption/InceptionV3.yaml @@ -77,7 +77,9 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: - size: 224 + resize_short: 320 + - CropImage: + size: 299 - NormalizeImage: scale: 0.00392157 mean: [0.485, 0.456, 0.406] diff --git a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1.yaml b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1.yaml index 13184416..fd9a61f3 100644 --- a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1.yaml +++ b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_25.yaml b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_25.yaml index 75428a6c..b2bb3f4d 100644 --- a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_25.yaml +++ b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_25.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_5.yaml b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_5.yaml index b516f554..a0c2dbda 100644 --- a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_5.yaml +++ b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_5.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_75.yaml b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_75.yaml index 700f5c65..5b41ea69 100644 --- a/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_75.yaml +++ b/ppcls/configs/ImageNet/MobileNetV1/MobileNetV1_x0_75.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_35.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_35.yaml index d18c211a..c07db1ac 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_35.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_35.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_5.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_5.yaml index c1ff15e2..2782e358 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_5.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_5.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_75.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_75.yaml index fd387f00..d2032e05 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_75.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x0_75.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml index b9072ed2..69f182ad 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_25.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_25.yaml index 472942a7..66b96e63 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_25.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_25.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_35.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_35.yaml index 4312730f..e8ec411d 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_35.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_35.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_5.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_5.yaml index 427a2793..e0dda22c 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_5.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_5.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_75.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_75.yaml index 82246d4e..a8eff022 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_75.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x0_75.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_0.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_0.yaml index f2810c67..3d79e868 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_0.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_0.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_25.yaml b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_25.yaml index d42bddc0..0e4d2060 100644 --- a/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_25.yaml +++ b/ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_small_x1_25.yaml @@ -24,6 +24,7 @@ Loss: Train: - CELoss: weight: 1.0 + epsilon: 0.1 Eval: - CELoss: weight: 1.0 @@ -75,6 +76,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet101.yaml b/ppcls/configs/ImageNet/ResNet/ResNet101.yaml index ed1405e7..2823bcd0 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet101.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet101.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet101_vd.yaml b/ppcls/configs/ImageNet/ResNet/ResNet101_vd.yaml index ab25cdcc..35496151 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet101_vd.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet101_vd.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet152.yaml b/ppcls/configs/ImageNet/ResNet/ResNet152.yaml index bc49c6bc..c654cff1 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet152.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet152.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet152_vd.yaml b/ppcls/configs/ImageNet/ResNet/ResNet152_vd.yaml index e190e68f..02f663d9 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet152_vd.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet152_vd.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet18.yaml b/ppcls/configs/ImageNet/ResNet/ResNet18.yaml index 382a1a38..da265e21 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet18.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet18.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet18_vd.yaml b/ppcls/configs/ImageNet/ResNet/ResNet18_vd.yaml index dcc1508f..e4fa5613 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet18_vd.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet18_vd.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet200_vd.yaml b/ppcls/configs/ImageNet/ResNet/ResNet200_vd.yaml index 84b8acf0..04893335 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet200_vd.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet200_vd.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet34.yaml b/ppcls/configs/ImageNet/ResNet/ResNet34.yaml index 07f7036e..29935296 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet34.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet34.yaml @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet34_vd.yaml b/ppcls/configs/ImageNet/ResNet/ResNet34_vd.yaml index 92f8bf3d..c7b97d2b 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet34_vd.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet34_vd.yaml @@ -17,7 +17,7 @@ Global: # model architecture Arch: - name: "ResNet101_vd" + name: "ResNet34_vd" # loss function config for traing/eval process Loss: @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet50.yaml b/ppcls/configs/ImageNet/ResNet/ResNet50.yaml index a55aeb4e..7262c781 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet50.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet50.yaml @@ -1,6 +1,6 @@ # global configs Global: - checkpoints: null + checkpoints: "output/ResNet50/ppcls_epoch_15" pretrained_model: null output_dir: "./output/" device: "gpu" @@ -77,6 +77,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/ResNet/ResNet50_vd.yaml b/ppcls/configs/ImageNet/ResNet/ResNet50_vd.yaml index 8d4305fa..bdbd7297 100644 --- a/ppcls/configs/ImageNet/ResNet/ResNet50_vd.yaml +++ b/ppcls/configs/ImageNet/ResNet/ResNet50_vd.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/VGG/VGG11.yaml b/ppcls/configs/ImageNet/VGG/VGG11.yaml index 34648346..f6440b16 100644 --- a/ppcls/configs/ImageNet/VGG/VGG11.yaml +++ b/ppcls/configs/ImageNet/VGG/VGG11.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/VGG/VGG13.yaml b/ppcls/configs/ImageNet/VGG/VGG13.yaml index c57081bb..36643038 100644 --- a/ppcls/configs/ImageNet/VGG/VGG13.yaml +++ b/ppcls/configs/ImageNet/VGG/VGG13.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/VGG/VGG16.yaml b/ppcls/configs/ImageNet/VGG/VGG16.yaml index 6e1c4045..491e4bb8 100644 --- a/ppcls/configs/ImageNet/VGG/VGG16.yaml +++ b/ppcls/configs/ImageNet/VGG/VGG16.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/configs/ImageNet/VGG/VGG19.yaml b/ppcls/configs/ImageNet/VGG/VGG19.yaml index 28b5a101..827fb63e 100644 --- a/ppcls/configs/ImageNet/VGG/VGG19.yaml +++ b/ppcls/configs/ImageNet/VGG/VGG19.yaml @@ -75,6 +75,8 @@ DataLoader: cls_label_path: "./dataset/ILSVRC2012/val_list.txt" transform_ops: - ResizeImage: + resize_short: 256 + - CropImage: size: 224 - NormalizeImage: scale: 0.00392157 diff --git a/ppcls/data/dataset/imagenet_dataset.py b/ppcls/data/dataset/imagenet_dataset.py index 16430424..930d55fb 100644 --- a/ppcls/data/dataset/imagenet_dataset.py +++ b/ppcls/data/dataset/imagenet_dataset.py @@ -30,13 +30,18 @@ from .common_dataset import CommonDataset class ImageNetDataset(CommonDataset): - def _load_anno(self): + def _load_anno(self, seed=None): assert os.path.exists(self._cls_path) assert os.path.exists(self._img_root) self.images = [] self.labels = [] + with open(self._cls_path) as fd: lines = fd.readlines() + if seed is not None: + np.random.RandomState(seed).shuffle(lines) + else: + np.random.shuffle(lines) for l in lines: l = l.strip().split(" ") self.images.append(os.path.join(self._img_root, l[0])) -- GitLab