Skip to content

switch data layer default source to lmdb from leveldb #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shelhamer wants to merge 1 commit into from
Closed

switch data layer default source to lmdb from leveldb #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions examples/cifar10/cifar10_full_train_test.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ layers {
top: "label"
data_param {
source: "examples/cifar10/cifar10_train_leveldb"
backend: LEVELDB
batch_size: 100
}
transform_param {
Expand All @@ -20,6 +21,7 @@ layers {
top: "label"
data_param {
source: "examples/cifar10/cifar10_test_leveldb"
backend: LEVELDB
batch_size: 100
}
transform_param {
Expand Down
2 changes: 2 additions & 0 deletions examples/cifar10/cifar10_quick_train_test.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ layers {
top: "label"
data_param {
source: "examples/cifar10/cifar10_train_leveldb"
backend: LEVELDB
batch_size: 100
}
transform_param {
Expand All @@ -20,6 +21,7 @@ layers {
top: "label"
data_param {
source: "examples/cifar10/cifar10_test_leveldb"
backend: LEVELDB
batch_size: 100
}
transform_param {
Expand Down
2 changes: 1 addition & 1 deletion examples/cifar10/create_cifar10.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ rm -rf $EXAMPLE/cifar10_train_leveldb $EXAMPLE/cifar10_test_leveldb
echo "Computing image mean..."

./build/tools/compute_image_mean $EXAMPLE/cifar10_train_leveldb \
$EXAMPLE/mean.binaryproto
$EXAMPLE/mean.binaryproto leveldb

echo "Done."
2 changes: 2 additions & 0 deletions examples/siamese/mnist_siamese_train_test.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ layers {
top: "sim"
data_param {
source: "examples/siamese/mnist_siamese_train_leveldb"
backend: LEVELDB
scale: 0.00390625
batch_size: 64
}
Expand All @@ -18,6 +19,7 @@ layers {
top: "sim"
data_param {
source: "examples/siamese/mnist_siamese_test_leveldb"
backend: LEVELDB
scale: 0.00390625
batch_size: 100
}
Expand Down
1 change: 1 addition & 0 deletions examples/siamese/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ or different classes (`sim`).
top: "sim"
data_param {
source: "examples/siamese/mnist-siamese-train-leveldb"
backend: LEVELDB
scale: 0.00390625
batch_size: 64
}
Expand Down
8 changes: 4 additions & 4 deletions src/caffe/proto/caffe.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@ message DataParameter {
// The rand_skip variable is for the data layer to skip a few data points
// to avoid all asynchronous sgd clients to start at the same point. The skip
// point would be set as rand_skip * rand(0,1). Note that rand_skip should not
// be larger than the number of keys in the leveldb.
// be larger than the number of keys in the db.
optional uint32 rand_skip = 7 [default = 0];
optional DB backend = 8 [default = LEVELDB];
optional DB backend = 8 [default = LMDB];
// DEPRECATED. See TransformationParameter. For data pre-processing, we can do
// simple scaling and subtracting the data mean, if provided. Note that the
// mean subtraction is always carried out before scaling.
Expand Down Expand Up @@ -504,7 +504,7 @@ message ImageDataParameter {
// The rand_skip variable is for the data layer to skip a few data points
// to avoid all asynchronous sgd clients to start at the same point. The skip
// point would be set as rand_skip * rand(0,1). Note that rand_skip should not
// be larger than the number of keys in the leveldb.
// be larger than the number of keys in the db.
optional uint32 rand_skip = 7 [default = 0];
// Whether or not ImageLayer should shuffle the list of files at every epoch.
optional bool shuffle = 8 [default = false];
Expand Down Expand Up @@ -741,7 +741,7 @@ message V0LayerParameter {
// The rand_skip variable is for the data layer to skip a few data points
// to avoid all asynchronous sgd clients to start at the same point. The skip
// point would be set as rand_skip * rand(0,1). Note that rand_skip should not
// be larger than the number of keys in the leveldb.
// be larger than the number of keys in the db.
optional uint32 rand_skip = 53 [default = 0];

// Fields related to detection (det_*)
Expand Down