Merge pull request #652 from yuyu2172/no-lambda

Do not use lambdas for add_getter

chainercv/datasets/ade20k/ade20k_semantic_segmentation_dataset.py

@@ -62,9 +62,15 @@ def __init__(self, data_dir='auto', split='train'):
         self.img_paths = sorted(glob.glob(os.path.join(img_dir, '*.jpg')))
         self.label_paths = sorted(glob.glob(os.path.join(label_dir, '*.png')))
 
-        self.add_getter('img', lambda i: read_image(self.img_paths[i]))
-        self.add_getter('iabel', lambda i: read_image(
-            self.label_paths[i], dtype=np.int32, color=False)[0])
+        self.add_getter('img', self._get_image)
+        self.add_getter('label', self._get_label)
 
     def __len__(self):
         return len(self.img_paths)
+
+    def _get_image(self, i):
+        return read_image(self.img_paths[i])
+
+    def _get_label(self, i):
+        return read_image(
+            self.label_paths[i], dtype=np.int32, color=False)[0]

chainercv/datasets/ade20k/ade20k_test_image_dataset.py

@@ -41,8 +41,11 @@ def __init__(self, data_dir='auto'):
         img_dir = os.path.join(data_dir, 'release_test', 'testing')
         self.img_paths = sorted(glob.glob(os.path.join(img_dir, '*.jpg')))
 
-        self.add_getter('img', lambda i: read_image(self.img_paths[i]))
+        self.add_getter('img', self._get_image)
         self.keys = 'img'  # do not return tuple
 
     def __len__(self):
         return len(self.img_paths)
+
+    def _get_image(self, i):
+        return read_image(self.img_paths[i])

chainercv/datasets/cityscapes/cityscapes_semantic_segmentation_dataset.py

@@ -88,12 +88,15 @@ def __init__(self, data_dir='auto', label_resolution=None, split='train',
             img_path = os.path.join(img_dir, city_dname, img_path)
             self.img_paths.append(img_path)
 
-        self.add_getter('img', lambda i: read_image(self.img_paths[i]))
+        self.add_getter('img', self._get_image)
         self.add_getter('label', self._get_label)
 
     def __len__(self):
         return len(self.img_paths)
 
+    def _get_image(self, i):
+        return read_image(self.img_paths[i])
+
     def _get_label(self, i):
         label_orig = read_image(
             self.label_paths[i], dtype=np.int32, color=False)[0]

chainercv/datasets/cityscapes/cityscapes_test_image_dataset.py

@@ -54,8 +54,11 @@ def __init__(self, data_dir='auto'):
                     os.path.join(city_dname, '*_leftImg8bit.png'))):
                 self.img_paths.append(img_path)
 
-        self.add_getter('img', lambda i: read_image(self.img_paths[i]))
+        self.add_getter('img', self._get_image)
         self.keys = 'img'  # do not return tuple
 
     def __len__(self):
         return len(self.img_paths)
+
+    def _get_image(self, i):
+        return read_image(self.img_paths[i])

chainercv/datasets/cub/cub_label_dataset.py

@@ -54,11 +54,14 @@ def __init__(self, data_dir='auto', return_bb=False,
                   d_label in open(image_class_labels_file)]
         self._labels = np.array(labels, dtype=np.int32)
 
-        self.add_getter('label', lambda i: self._labels[i])
+        self.add_getter('label', self._get_label)
 
         keys = ('img', 'label')
         if return_bb:
             keys += ('bb',)
         if return_prob_map:
             keys += ('prob_map',)
         self.keys = keys
+
+    def _get_label(self, i):
+        return self._labels[i]

chainercv/datasets/directory_parsing_label_dataset.py

@@ -138,9 +138,14 @@ def __init__(self, root, check_img_file=None, color=True,
         self.img_paths, self.labels = _parse_label_dataset(
             root, label_names, check_img_file)
 
-        self.add_getter('img', lambda i:
-                        read_image(self.img_paths[i], color=self.color))
-        self.add_getter('label', lambda i: self.labels[i])
+        self.add_getter('img', self._get_image)
+        self.add_getter('label', self._get_label)
 
     def __len__(self):
         return len(self.img_paths)
+
+    def _get_image(self, i):
+        return read_image(self.img_paths[i], color=self.color)
+
+    def _get_label(self, i):
+        return self.labels[i]

chainercv/datasets/online_products/online_products_dataset.py

@@ -90,12 +90,18 @@ def __init__(self, data_dir='auto', split='train'):
         self.super_class_ids += [int(id_[2]) - 1 for id_ in ids_tmp]
         self.paths += [os.path.join(data_dir, id_[3]) for id_ in ids_tmp]
 
-        self.add_getter('img', lambda i:
-                        utils.read_image(self.paths[i], color=True))
-        self.add_getter('label', lambda i:
-                        np.array(self.class_ids[i], np.int32))
-        self.add_getter('super_label', lambda i:
-                        np.array(self.super_class_ids[i], np.int32))
+        self.add_getter('img', self._get_label)
+        self.add_getter('label', self._get_label)
+        self.add_getter('super_label', self._get_super_label)
 
     def __len__(self):
         return len(self.paths)
+
+    def _get_image(self, i):
+        return utils.read_image(self.paths[i], color=True)
+
+    def _get_label(self, i):
+        return np.array(self.class_ids[i], np.int32)
+
+    def _get_super_label(self, i):
+        return np.array(self.super_class_ids[i], np.int32)