diff --git a/lib/roi_data_layer/layer.py b/lib/roi_data_layer/layer.py index 673b828f3dbbb9742ce1075c0e1994aca3ed9d68..6f25de888edd9df05f822b7d8b16e0408fe40220 100644 --- a/lib/roi_data_layer/layer.py +++ b/lib/roi_data_layer/layer.py @@ -12,7 +12,7 @@ import numpy as np import yaml from multiprocessing import Process, queues -class DataLayer(caffe.Layer): +class RoIDataLayer(caffe.Layer): """Fast R-CNN data layer.""" def _shuffle_roidb_inds(self): @@ -36,7 +36,7 @@ class DataLayer(caffe.Layer): db_inds = self._get_next_minibatch_inds() minibatch_db = [self._roidb[i] for i in db_inds] if cfg.TRAIN.USE_PREFETCH: - self._prefetch_process = Process(target=DataLayer._prefetch, + self._prefetch_process = Process(target=RoIDataLayer._prefetch, args=(minibatch_db, self._num_classes, self._prefetch_queue)) diff --git a/models/CaffeNet/train.prototxt b/models/CaffeNet/train.prototxt index 5fc6adde85c515609cb3aedd517ddf7475e67ac7..10a36668562e65d0e57341779afcdfab2f941817 100644 --- a/models/CaffeNet/train.prototxt +++ b/models/CaffeNet/train.prototxt @@ -9,7 +9,7 @@ layer { top: 'bbox_loss_weights' python_param { module: 'roi_data_layer.layer' - layer: 'DataLayer' + layer: 'RoIDataLayer' param_str: "'num_classes': 21" } } diff --git a/models/VGG16/train.prototxt b/models/VGG16/train.prototxt index fbd309552630242789a7c16c107e801810404e54..649bc0923aab46a5115a6f637035c83b81389a73 100644 --- a/models/VGG16/train.prototxt +++ b/models/VGG16/train.prototxt @@ -9,7 +9,7 @@ layer { top: 'bbox_loss_weights' python_param { module: 'roi_data_layer.layer' - layer: 'DataLayer' + layer: 'RoIDataLayer' param_str: "'num_classes': 21" } } diff --git a/models/VGG_CNN_M_1024/train.prototxt b/models/VGG_CNN_M_1024/train.prototxt index 6a6917751aa91e7d7eb493168038c9459e861975..6bf66dab761527427f320698aafe41a9eca4d422 100644 --- a/models/VGG_CNN_M_1024/train.prototxt +++ b/models/VGG_CNN_M_1024/train.prototxt @@ -9,7 +9,7 @@ layer { top: 'bbox_loss_weights' python_param { module: 'roi_data_layer.layer' - layer: 'DataLayer' + layer: 'RoIDataLayer' param_str: "'num_classes': 21" } }