From 390f538ddb83f7084fd94db83a6b898bc5f86f58 Mon Sep 17 00:00:00 2001
From: Ross Girshick <ross.girshick@gmail.com>
Date: Mon, 27 Apr 2015 11:46:37 -0700
Subject: [PATCH] DataLayer -> RoIDataLayer
---
lib/roi_data_layer/layer.py | 4 ++--
models/CaffeNet/train.prototxt | 2 +-
models/VGG16/train.prototxt | 2 +-
models/VGG_CNN_M_1024/train.prototxt | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/roi_data_layer/layer.py b/lib/roi_data_layer/layer.py
index 673b828..6f25de8 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 5fc6add..10a3666 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 fbd3095..649bc09 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 6a69177..6bf66da 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"
}
}
--
GitLab