diff --git a/demo/object_detection/test/balloon1.jpg b/demo/object_detection/test/balloon1.jpg new file mode 100755 index 0000000000000000000000000000000000000000..bd24e5ab61c4f1b2f3ca55e6c25112f56a6810ca Binary files /dev/null and b/demo/object_detection/test/balloon1.jpg differ diff --git a/demo/object_detection/test/balloon2.jpg b/demo/object_detection/test/balloon2.jpg new file mode 100755 index 0000000000000000000000000000000000000000..a437e4bbc9e18edd3e3dfc057612afb417d7193d Binary files /dev/null and b/demo/object_detection/test/balloon2.jpg differ diff --git a/demo/object_detection/test/test.txt b/demo/object_detection/test/test.txt deleted file mode 100644 index e88dd74263037b483d9cf4f3210f852d319303d4..0000000000000000000000000000000000000000 --- a/demo/object_detection/test/test.txt +++ /dev/null @@ -1,2 +0,0 @@ -IMAGE_PATH -./resources/test/test_img_bird.jpg diff --git a/demo/object_detection/test/test.yml b/demo/object_detection/test/test.yml deleted file mode 100644 index a37449b83b4732769ae9f12170330dc8bda32c83..0000000000000000000000000000000000000000 --- a/demo/object_detection/test/test.yml +++ /dev/null @@ -1,6 +0,0 @@ -input_data: - image: - type : IMAGE - key : IMAGE_PATH -config: - top_only : True diff --git a/demo/object_detection/test/test_img_bird.jpg b/demo/object_detection/test/test_img_bird.jpg deleted file mode 100644 index 2f4690c6e6f1cacca38b9dc80059383bc4ba93b7..0000000000000000000000000000000000000000 Binary files a/demo/object_detection/test/test_img_bird.jpg and /dev/null differ diff --git a/demo/object_detection/test/test_img_cat.jpg b/demo/object_detection/test/test_img_cat.jpg deleted file mode 100644 index c1055eca9e249e6780078638dfd90ea3200a4716..0000000000000000000000000000000000000000 Binary files a/demo/object_detection/test/test_img_cat.jpg and /dev/null differ diff --git a/demo/object_detection/test/test_img_daisy.jpg b/demo/object_detection/test/test_img_daisy.jpg deleted file mode 100644 index 688cc3e6bda17c384116bc3cec0eba6474984a1d..0000000000000000000000000000000000000000 Binary files a/demo/object_detection/test/test_img_daisy.jpg and /dev/null differ diff --git a/demo/object_detection/test/test_img_roses.jpg b/demo/object_detection/test/test_img_roses.jpg deleted file mode 100644 index 711c883e09aa528bafd26021798aa11506e2113d..0000000000000000000000000000000000000000 Binary files a/demo/object_detection/test/test_img_roses.jpg and /dev/null differ diff --git a/demo/object_detection/test/test_img_sheep.jpg b/demo/object_detection/test/test_img_sheep.jpg deleted file mode 100644 index 94f1e4b5e61f873003da0a0175764892e0047239..0000000000000000000000000000000000000000 Binary files a/demo/object_detection/test/test_img_sheep.jpg and /dev/null differ diff --git a/paddlehub/dataset/__init__.py b/paddlehub/dataset/__init__.py index 04d823aded9a3946b5ef0fec4c808763ba568fe4..860f802a5cf1a04be56ab2daba79159a51a7e0b6 100644 --- a/paddlehub/dataset/__init__.py +++ b/paddlehub/dataset/__init__.py @@ -37,4 +37,4 @@ from .flowers import FlowersDataset as Flowers from .stanford_dogs import StanfordDogsDataset as StanfordDogs from .food101 import Food101Dataset as Food101 from .indoor67 import Indoor67Dataset as Indoor67 -from .coco10 import Coco10 +from .balloon import Balloon diff --git a/paddlehub/dataset/coco10.py b/paddlehub/dataset/balloon.py similarity index 55% rename from paddlehub/dataset/coco10.py rename to paddlehub/dataset/balloon.py index 13be0186d159cf5918897fb9854815552876bf7c..ab06efff2fc9962d7015c5818ac6f7846ab708cd 100644 --- a/paddlehub/dataset/coco10.py +++ b/paddlehub/dataset/balloon.py @@ -23,18 +23,19 @@ import paddlehub as hub from paddlehub.dataset.base_cv_dataset import ObjectDetectionDataset -class Coco10(ObjectDetectionDataset): +class Balloon(ObjectDetectionDataset): def __init__(self, model_type='ssd'): - dataset_path = os.path.join(hub.common.dir.DATA_HOME, "coco_10") - # self.base_path = self._download_dataset( - # dataset_path=dataset_path, - # url="https://bj.bcebos.com/paddlehub-dataset/dog-cat.tar.gz") + dataset_path = os.path.join(hub.common.dir.DATA_HOME, "balloon") + self.base_path = self._download_dataset( + dataset_path=dataset_path, + url="https://bj.bcebos.com/paddlehub-dataset/balloon.tar.gz") base_path = dataset_path - train_image_dir = 'val' - train_list_file = 'annotations/val.json' - validate_image_dir = 'val' - validate_list_file = 'annotations/val.json' - test_image_dir = 'val' - test_list_file = 'annotations/val.json' - super(Coco10, self).__init__(base_path, train_image_dir, train_list_file, validate_image_dir, validate_list_file, - test_image_dir, test_list_file, model_type) + train_image_dir = 'JPEGImages' + train_list_file = 'train.json' + validate_image_dir = 'JPEGImages' + validate_list_file = 'val.json' + test_image_dir = 'JPEGImages' + test_list_file = 'val.json' + super(Balloon, self).__init__( + base_path, train_image_dir, train_list_file, validate_image_dir, + validate_list_file, test_image_dir, test_list_file, model_type)