XML dataset addition + mxnet-cu102 fix

bin/install.sh

@@ -35,17 +35,16 @@ pip3 install setuptools configparser
 sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list' \
             && curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
 
+# Build OpenDR
+make install_compilation_dependencies
+make install_runtime_dependencies
+make libopendr
 
-# If working on GPU install GPU dependencies beforehand
+# If working on GPU install GPU dependencies as needed
 if [[ "${OPENDR_DEVICE}" == "gpu" ]]; then
   echo "[INFO] Installing  mxnet-cu102==1.8.0. You can override this later if you are using a different CUDA version."
   pip3 install mxnet-cu102==1.8.0
 fi
 
-# Build OpenDR
-make install_compilation_dependencies
-make install_runtime_dependencies
-make libopendr
-
 deactivate
 

docs/reference/object-detection-2d-centernet.md

@@ -5,7 +5,7 @@ The *centernet* module contains the *CenterNetDetectorLearner* class, which inhe
 ### Class CenterNetDetectorLearner
 Bases: `engine.learners.Learner`
 
-The *CenterNetDetectorLearner* class is a wrapper of the SSD detector[[1]](#centernet-1)
+The *CenterNetDetectorLearner* class is a wrapper of the CenterNet detector[[1]](#centernet-1)
 [GluonCV implementation](https://github.com/dmlc/gluon-cv/blob/master/gluoncv/model_zoo/center_net/center_net.py).
 It can be used to perform object detection on images (inference) as well as train new object detection models.
 

docs/reference/object-detection-2d-datasets.md

@@ -0,0 +1,87 @@
+# Object Detection 2D Datasets
+
+## Base Classes
+
+### DetectionDataset base class
+
+Bases: `engine.datasets.DatasetIterator`
+
+The *DetectionDataset* class inherits from the *DatasetIterator* class and extends it with functions and properties aimed at 2d Object Detection datasets. Each *DetectionDataset* object must be initialized with the following parameters:
+
+- **classes**: *list*\
+  List of class names of the training dataset.
+- **dataset_type**: *str*\
+  Dataset type, i`.e., an assigned name.
+- **root**: *str*\
+  Path to dataset root directory.
+- **image_paths**: *list, default=None*\
+  List of image data paths.
+- **splits**: *str, default=''*\
+  List of dataset splits to load (e.g., train/val).
+- **image_transform**: *callable object, default=None*\
+  Transformation to apply to images. Intended for image format transformations.
+- **target_transform**: *callable object, default=None*\
+  Transformation to apply to bounding boxes. Intended for formatting the bounding boxes for each detector.
+- **transform**: *callable object, default=None*\
+  Transformation to apply to both images and bounding boxes. Intended for data augmentation purposes.
+
+Methods:
+
+#### `DetectionDataset.set_transform`
+Setter for the internal **transform** object/function.
+
+#### `DetectionDataset.set_image_transform`
+Setter for the internal **image_transform** object/function.
+
+#### `DetectionDataset.set_target_transform`
+Setter for the internal **target_transform** object/function.
+
+#### `DetectionDataset.transform`
+Returns the `DetectionDataset` wrapped as a `MappedDetectionDataset`, where the data is transformed according to the argument callable object/function. This function ensures fit/eval compatibility between `DetectionDataset` and `ExternalDataset` for [GluonCV](https://github.com/dmlc/gluon-cv) based detectors.
+
+#### `DetectionDataset.get_image`
+Returns an image from the dataset. Intended for test sets without annotations.
+
+#### `DetectionDataset.get_bboxes`
+Returns the bounding boxes for a given sample.
+
+
+### MappedDetectionDataset class
+
+Bases: `engine.datasets.DatasetIterator`
+
+This class wraps any `DetectionDataset` and applies `map_function` to the data.
+
+### ConcatDataset class
+
+Bases: `perception.object_detection_2d.datasets.DetetionDataset`
+
+Returns a new `DetectionDataset` which is a concatenation of the `datasets` param. The datasets are assumed to have the same classes.
+
+### XMLBasedDataset class
+
+Bases: `perception.object_detection_2d.datasets.DetetionDataset`
+
+This class is intended for any dataset in PASCAL VOC .xml format, making it compatible with datasets annotated using the [labelImg](https://github.com/tzutalin/labelImg) tool. Each *XMLBasedDataset* object must be initialized with the following parameters:
+
+- **dataset_type**: *str*\
+  Dataset type, i.e., assigned name.
+- **root**: *str*\
+  Path to dataset root directory.
+- **classes**: *list, default=None*\
+  Class names. If None, they will be inferred from the annotations.
+- **splits**: *str, default=''*\
+  List of dataset splits to load (e.g., train/val).
+- **image_transform**: *callable object, default=None*\
+  Transformation to apply to images. Intended for image format transformations.
+- **target_transform**: *callable object, default=None*\
+  Transformation to apply to bounding boxes. Intended for formatting the bounding boxes for each detector.
+- **transform**: *callable object, default=None*\
+  Transformation to apply to both images and bounding boxes. Intended for data augmentation purposes.
+- **images_dir**: *str, default='images'*\
+  Name of subdirectory containing dataset images.
+- **annotations_dir**: *str, default='annotations'*\
+  Name of subdirectory containing dataset annotations.
+- **preload_anno**: *bool, default=False*\
+  Whether to preload annotations, for datasets that fit in memory.
+

src/opendr/perception/object_detection_2d/datasets/__init__.py

@@ -1,5 +1,8 @@
 from .detection_dataset import DetectionDataset
 from .wider_face import WiderFaceDataset
 from .wider_person import WiderPersonDataset
+from .xmldataset import XMLBasedDataset
+from .detection_dataset import ConcatDataset
 
-__all__ = ['DetectionDataset', 'WiderFaceDataset', 'WiderPersonDataset']
+__all__ = ['DetectionDataset', 'WiderFaceDataset', 'WiderPersonDataset', 'XMLBasedDataset',
+           'ConcatDataset']

src/opendr/perception/object_detection_2d/datasets/detection_dataset.py

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import bisect
+from itertools import accumulate
+
 from opendr.engine.datasets import DatasetIterator
 
 
@@ -68,3 +71,54 @@ def __getitem__(self, idx):
         if isinstance(item, tuple):
             return self.map_function(*item)
         return self.map_function(item)
+
+
+class ConcatDataset(DetectionDataset):
+    """
+    Basic dataset concatenation class. The datasets are assumed to have the same classes.
+
+    :param datasets: list of DetectionDataset type or subclass
+    """
+    def __init__(self, datasets):
+        super(ConcatDataset, self).__init__(classes=datasets[0].classes, dataset_type='concat_dataset',
+                                            root=None)
+        self.cumulative_lengths = list(accumulate([len(dataset) for dataset in datasets]))
+        self.datasets = datasets
+
+    def set_transform(self, transform):
+        self._transform = transform
+        for dataset in self.datasets:
+            dataset.transform(transform)
+
+    def transform(self, transform):
+        mapped_datasets = [MappedDetectionDataset(dataset, transform) for dataset in self.datasets]
+        return ConcatDataset(mapped_datasets)
+
+    def set_image_transform(self, transform):
+        self._image_transform = transform
+        for dataset in self.datasets:
+            dataset.set_image_transform(transform)
+
+    def set_target_transform(self, transform):
+        self._target_transform = transform
+        for dataset in self.datasets:
+            dataset.set_target_transform(transform)
+
+    def __len__(self):
+        return self.cumulative_lengths[-1]
+
+    def __getitem__(self, item):
+        dataset_idx = bisect.bisect_right(self.cumulative_lengths, item)
+        if dataset_idx == 0:
+            sample_idx = item
+        else:
+            sample_idx = item - self.cumulative_lengths[dataset_idx - 1]
+        return self.datasets[dataset_idx][sample_idx]
+
+
+def is_image_type(filename):
+    return filename.lower().endswith(('png', 'jpg', 'jpeg', 'tiff', 'bmp', 'gif'))
+
+
+def remove_extension(filename):
+    return '.'.join(filename.split('.')[:-1])

src/opendr/perception/object_detection_2d/datasets/xmldataset.py

@@ -0,0 +1,114 @@
+# Copyright 2020-2022 OpenDR European Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+try:
+    import xml.etree.cElementTree as ET
+except ImportError:
+    import xml.etree.ElementTree as ET
+import cv2
+
+from opendr.engine.data import Image
+from opendr.engine.target import BoundingBox, BoundingBoxList
+from opendr.perception.object_detection_2d.datasets.detection_dataset import DetectionDataset, is_image_type, remove_extension
+
+
+class XMLBasedDataset(DetectionDataset):
+    """
+    Reader class for datasets annotated with the LabelImg tool in Pascal VOC XML format.
+    The dataset should be in the following structure:
+    data_root
+    |-- images
+    |-- annotations
+    The exact names of the folders can be passed as arguments (images_dir) and (annotations_dir).
+    """
+    def __init__(self, dataset_type, root, classes=None, image_transform=None,
+                 target_transform=None, transform=None, splits='',
+                 images_dir='images', annotations_dir='annotations', preload_anno=False):
+        self.abs_images_dir = os.path.join(root, images_dir)
+        self.abs_annot_dir = os.path.join(root, annotations_dir)
+        image_names = [im_filename for im_filename in os.listdir(self.abs_images_dir)
+                       if is_image_type(im_filename)]
+
+        if classes is None:
+            classes = []
+        self.classes = classes
+        super().__init__(classes, dataset_type, root, image_transform=image_transform, target_transform=target_transform,
+                         transform=transform, image_paths=image_names, splits=splits)
+        self.bboxes = []
+        self.preload_anno = preload_anno
+        if preload_anno:
+            for image_name in image_names:
+                annot_file = os.path.join(self.abs_annot_dir, remove_extension(image_name) + '.xml')
+                bboxes = self._read_annotation_file(annot_file)
+                self.bboxes.append(bboxes)
+
+    def _read_annotation_file(self, filename):
+        root = ET.parse(filename).getroot()
+        bounding_boxes = []
+        for obj in root.iter('object'):
+            cls_name = obj.find('name').text.strip().lower()
+            if cls_name not in self.classes:
+                self.classes.append(cls_name)
+            cls_id = self.classes.index(cls_name)
+            xml_box = obj.find('bndbox')
+            xmin = (float(xml_box.find('xmin').text) - 1)
+            ymin = (float(xml_box.find('ymin').text) - 1)
+            xmax = (float(xml_box.find('xmax').text) - 1)
+            ymax = (float(xml_box.find('ymax').text) - 1)
+            bounding_box = BoundingBox(name=int(cls_id),
+                                       left=float(xmin), top=float(ymin),
+                                       width=float(xmax) - float(xmin),
+                                       height=float(ymax) - float(ymin))
+            bounding_boxes.append(bounding_box)
+        return BoundingBoxList(boxes=bounding_boxes)
+
+    def __len__(self):
+        return len(self.image_paths)
+
+    def __getitem__(self, item):
+        image_name = self.image_paths[item]
+        image_path = os.path.join(self.abs_images_dir, image_name)
+        img_np = cv2.imread(image_path)
+        img = Image(img_np)
+
+        if self.preload_anno:
+            label = self.bboxes[item]
+        else:
+            annot_file = os.path.join(self.abs_annot_dir, remove_extension(image_name) + '.xml')
+            label = self._read_annotation_file(annot_file)
+
+        if self._image_transform is not None:
+            img = self._image_transform(img)
+
+        if self._target_transform is not None:
+            label = self._target_transform(label)
+
+        if self._transform is not None:
+            return self._transform(img, label)
+        return img, label
+
+    def get_image(self, item):
+        image_name = self.image_paths[item]
+        image_path = os.path.join(self.abs_images_dir, image_name)
+        img_np = cv2.imread(image_path)
+        if self._image_transform is not None:
+            img = self._image_transform(img_np)
+        return img
+
+    def get_bboxes(self, item):
+        boxes = self.bboxes[item]
+        if self._target_transform is not None:
+            boxes = self._target_transform(boxes)
+        return boxes

src/opendr/perception/object_detection_2d/ssd/ssd_learner.py

@@ -87,6 +87,7 @@ def __init__(self, lr=1e-3, epochs=120, batch_size=8,
                 self.ctx = mx.gpu(0)
             else:
                 self.ctx = mx.cpu()
+                print("Device set to cuda but no GPU available, using CPU...")
         else:
             self.ctx = mx.cpu()