From c62a9245314480be59f7273f6ee7b7d489674dad Mon Sep 17 00:00:00 2001
From: LielinJiang <jianglielin@baidu.com>
Date: Mon, 6 Jul 2020 02:26:17 +0000
Subject: [PATCH] rename some dataset

---
 configs/cyclegan_cityscapes.yaml                       |  2 +-
 configs/cyclegan_horse2zebra.yaml                      |  2 +-
 configs/pix2pix_cityscapes.yaml                        |  4 ++--
 configs/pix2pix_cityscapes_2gpus.yaml                  |  4 ++--
 ppgan/datasets/__init__.py                             |  4 ++--
 .../datasets/{aligned_dataset.py => paired_dataset.py} | 10 +++++-----
 .../{unaligned_dataset.py => unpaired_dataset.py}      |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename ppgan/datasets/{aligned_dataset.py => paired_dataset.py} (91%)
 rename ppgan/datasets/{unaligned_dataset.py => unpaired_dataset.py} (98%)

diff --git a/configs/cyclegan_cityscapes.yaml b/configs/cyclegan_cityscapes.yaml
index fd48f9f..cbd1b84 100644
--- a/configs/cyclegan_cityscapes.yaml
+++ b/configs/cyclegan_cityscapes.yaml
@@ -26,7 +26,7 @@ model:
 
 dataset:
   train:
-    name: UnalignedDataset
+    name: UnpairedDataset
     dataroot: data/cityscapes
     phase: train
     max_dataset_size: inf
diff --git a/configs/cyclegan_horse2zebra.yaml b/configs/cyclegan_horse2zebra.yaml
index 7cd27e3..72c7cf6 100644
--- a/configs/cyclegan_horse2zebra.yaml
+++ b/configs/cyclegan_horse2zebra.yaml
@@ -26,7 +26,7 @@ model:
 
 dataset:
   train:
-    name: UnalignedDataset
+    name: UnpairedDataset
     dataroot: data/horse2zebra
     phase: train
     max_dataset_size: inf
diff --git a/configs/pix2pix_cityscapes.yaml b/configs/pix2pix_cityscapes.yaml
index 3131d0b..b074fdd 100644
--- a/configs/pix2pix_cityscapes.yaml
+++ b/configs/pix2pix_cityscapes.yaml
@@ -23,7 +23,7 @@ model:
 
 dataset:
   train:
-    name: AlignedDataset
+    name: PairedDataset
     dataroot: data/cityscapes
     phase: train
     max_dataset_size: inf
@@ -38,7 +38,7 @@ dataset:
       preprocess: resize_and_crop
       no_flip: False
   test:
-    name: AlignedDataset
+    name: PairedDataset
     dataroot: data/cityscapes/
     phase: test
     max_dataset_size: inf
diff --git a/configs/pix2pix_cityscapes_2gpus.yaml b/configs/pix2pix_cityscapes_2gpus.yaml
index 5b785c1..387f16b 100644
--- a/configs/pix2pix_cityscapes_2gpus.yaml
+++ b/configs/pix2pix_cityscapes_2gpus.yaml
@@ -23,7 +23,7 @@ model:
 
 dataset:
   train:
-    name: AlignedDataset
+    name: PairedDataset
     dataroot: data/cityscapes
     phase: train
     max_dataset_size: inf
@@ -38,7 +38,7 @@ dataset:
       preprocess: resize_and_crop
       no_flip: False
   test:
-    name: AlignedDataset
+    name: PairedDataset
     dataroot: data/cityscapes/
     phase: test
     max_dataset_size: inf
diff --git a/ppgan/datasets/__init__.py b/ppgan/datasets/__init__.py
index 178cb4d..9b807e9 100644
--- a/ppgan/datasets/__init__.py
+++ b/ppgan/datasets/__init__.py
@@ -1,3 +1,3 @@
-from .unaligned_dataset import UnalignedDataset
+from .unpaired_dataset import UnpairedDataset
 from .single_dataset import SingleDataset
-from .aligned_dataset import AlignedDataset
+from .paired_dataset import PairedDataset
diff --git a/ppgan/datasets/aligned_dataset.py b/ppgan/datasets/paired_dataset.py
similarity index 91%
rename from ppgan/datasets/aligned_dataset.py
rename to ppgan/datasets/paired_dataset.py
index 8c8f8ce..368f837 100644
--- a/ppgan/datasets/aligned_dataset.py
+++ b/ppgan/datasets/paired_dataset.py
@@ -8,19 +8,19 @@ from .builder import DATASETS
 
 
 @DATASETS.register()
-class AlignedDataset(BaseDataset):
+class PairedDataset(BaseDataset):
     """A dataset class for paired image dataset.
     """
 
-    def __init__(self, opt):
+    def __init__(self, cfg):
         """Initialize this dataset class.
 
         Args:
             cfg (dict) -- stores all the experiment flags
         """
-        BaseDataset.__init__(self, opt)
-        self.dir_AB = os.path.join(opt.dataroot, opt.phase)  # get the image directory
-        self.AB_paths = sorted(make_dataset(self.dir_AB, opt.max_dataset_size))  # get image paths
+        BaseDataset.__init__(self, cfg)
+        self.dir_AB = os.path.join(cfg.dataroot, cfg.phase)  # get the image directory
+        self.AB_paths = sorted(make_dataset(self.dir_AB, cfg.max_dataset_size))  # get image paths
         assert(self.cfg.transform.load_size >= self.cfg.transform.crop_size)   # crop_size should be smaller than the size of loaded image
         self.input_nc = self.cfg.output_nc if self.cfg.direction == 'BtoA' else self.cfg.input_nc
         self.output_nc = self.cfg.input_nc if self.cfg.direction == 'BtoA' else self.cfg.output_nc
diff --git a/ppgan/datasets/unaligned_dataset.py b/ppgan/datasets/unpaired_dataset.py
similarity index 98%
rename from ppgan/datasets/unaligned_dataset.py
rename to ppgan/datasets/unpaired_dataset.py
index da673a0..5cabc53 100644
--- a/ppgan/datasets/unaligned_dataset.py
+++ b/ppgan/datasets/unpaired_dataset.py
@@ -8,7 +8,7 @@ from .builder import DATASETS
 
 
 @DATASETS.register()
-class UnalignedDataset(BaseDataset):
+class UnpairedDataset(BaseDataset):
     """
     """
 
-- 
GitLab