Merge remote-tracking branch 'origin/faster-rcnn' into faster-rcnn

jianyuheng · jianyuheng · commit 4030b0827da0 · 2019-03-05T17:04:51.000+08:00
diff --git a/datasets/pascalvoc_dataset.py b/datasets/pascalvoc_dataset.py
@@ -30,7 +30,7 @@
 tf.app.flags.DEFINE_integer('nb_smpls_train', 22136, '# of samples for training')
 tf.app.flags.DEFINE_integer('nb_smpls_val', 500, '# of samples for validation')
 tf.app.flags.DEFINE_integer('nb_smpls_eval', 4952, '# of samples for evaluation')
-tf.app.flags.DEFINE_integer('batch_size', 32, 'batch size per GPU for training')
+tf.app.flags.DEFINE_integer('batch_size', 1, 'batch size per GPU for training')
 tf.app.flags.DEFINE_integer('batch_size_eval', 1, 'batch size for evaluation')
 
 # Pascal VOC specifications
diff --git a/nets/vgg_at_pascalvoc.py b/nets/vgg_at_pascalvoc.py
@@ -26,6 +26,7 @@
 from datasets.pascalvoc_dataset import PascalVocDataset
 from utils.misc_utils import is_primary_worker
 
+from utils.external.ssd_tensorflow.preprocessing.ssd_preprocessing import preprocess_image
 from utils.external.ssd_tensorflow.net import ssd_net
 from utils.external.ssd_tensorflow.utility import anchor_manipulator
 from utils.external.ssd_tensorflow.utility import scaffolds
@@ -419,8 +420,8 @@ def __init__(self, data_format='channels_last'):
     super(ModelHelper, self).__init__(data_format)
 
     # initialize training & evaluation subsets
-    self.dataset_train = PascalVocDataset(is_train=True)
-    self.dataset_eval = PascalVocDataset(is_train=False)
+    self.dataset_train = PascalVocDataset(preprocess_fn=preprocess_image, is_train=True)
+    self.dataset_eval = PascalVocDataset(preprocess_fn=preprocess_image, is_train=False)
 
     # setup hyper-parameters & anchor information
     self.anchor_info = None  # track the most recently-used one
