diff --git a/experiments/scripts/faster_rcnn_end2end.sh b/experiments/scripts/faster_rcnn_end2end.sh index ec5c1669e..d87d14626 100755 --- a/experiments/scripts/faster_rcnn_end2end.sh +++ b/experiments/scripts/faster_rcnn_end2end.sh @@ -44,6 +44,18 @@ case $DATASET in PT_DIR="apc" ITERS=80000 ;; + apcbin) + TRAIN_IMDB="apc_bin_trainval" + TEST_IMDB="apc_bin_test" + PT_DIR="apc" + ITERS=20000 + ;; + apctote) + TRAIN_IMDB="apc_tote_trainval" + TEST_IMDB="apc_tote_test" + PT_DIR="apc" + ITERS=20000 + ;; *) echo "No dataset given" exit diff --git a/experiments/scripts/faster_rcnn_end2end_test.sh b/experiments/scripts/faster_rcnn_end2end_test.sh index fe84de413..16b870ac0 100755 --- a/experiments/scripts/faster_rcnn_end2end_test.sh +++ b/experiments/scripts/faster_rcnn_end2end_test.sh @@ -25,7 +25,15 @@ EXTRA_ARGS_SLUG=${EXTRA_ARGS// /_} case $DATASET in apc) - TEST_IMDB="apc_test_validated" + TEST_IMDB="apc_2016_test" + PT_DIR="apc" + ;; + apcbin) + TEST_IMDB="apc_bin_test" + PT_DIR="apc" + ;; + apctote) + TEST_IMDB="apc_tote_test" PT_DIR="apc" ;; *) diff --git a/lib/datasets/apc.py b/lib/datasets/apc.py index 81b6ac27a..8d000bc2c 100644 --- a/lib/datasets/apc.py +++ b/lib/datasets/apc.py @@ -46,7 +46,7 @@ def __init__(self, image_set, year, devkit_path=None): self._class_to_ind = _classes print self._classes - self._image_ext = '.jpg' + self._image_ext = '.png' self._image_index = self._load_image_set_index() # Default to roidb handler self._roidb_handler = self.selective_search_roidb @@ -87,7 +87,7 @@ def _load_image_set_index(self): Load the indexes listed in this dataset's image set file. """ # Example path to image set file: - # self._devkit_path + /DRapc2016/APC2007/ImageSets/Main/val.txt + # self._devkit_path + /DRapc2016/APC2016/ImageSets/Main/val.txt image_set_file = os.path.join(self._data_path, 'ImageSets', 'Main', self._image_set + '.txt') assert os.path.exists(image_set_file), \ diff --git a/lib/datasets/factory.py b/lib/datasets/factory.py index 9c92342f5..e5ee36cfd 100644 --- a/lib/datasets/factory.py +++ b/lib/datasets/factory.py @@ -21,7 +21,7 @@ __sets[name] = (lambda split=split, year=year: pascal_voc(split, year)) # Set up apc_2016_ -for year in ['2016', 'test']: +for year in ['2016', 'bin', 'tote']: for split in ['train', 'val', 'trainval', 'test', 'validated']: name = 'apc_{}_{}'.format(year, split) __sets[name] = (lambda split=split, year=year: apc(split, year))