Skip to content

All-in-one nets #734

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

Merged
jeffdonahue merged 4 commits into from
Jul 29, 2014
Merged

All-in-one nets #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2b74c3
Add NetState message with phase, level, stage; NetStateRule message with
jeffdonahue Jul 18, 2014
b883356
Add unit tests and skeleton code for Net/Solver filtering functionality.
jeffdonahue Jul 29, 2014
cb4555c
Incorporate NetState{,Rule} into Solver/Net. Net::FilterNet
jeffdonahue Jul 18, 2014
e526e2d
Use unified train/test nets in examples.
jeffdonahue Jul 18, 2014
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
6 changes: 2 additions & 4 deletions examples/cifar10/cifar10_full_solver.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# reduce learning rate after 120 epochs (60000 iters) by factor 0f 10
# then another factor of 10 after 10 more epochs (5000 iters)

# The training protocol buffer definition
train_net: "cifar10_full_train.prototxt"
# The testing protocol buffer definition
test_net: "cifar10_full_test.prototxt"
# The train/test net protocol buffer definition
net: "cifar10_full_train_test.prototxt"
# test_iter specifies how many forward passes the test should carry out.
# In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
# covering the full 10,000 testing images.
Expand Down
6 changes: 2 additions & 4 deletions examples/cifar10/cifar10_full_solver_lr1.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# reduce learning rate after 120 epochs (60000 iters) by factor 0f 10
# then another factor of 10 after 10 more epochs (5000 iters)

# The training protocol buffer definition
train_net: "cifar10_full_train.prototxt"
# The testing protocol buffer definition
test_net: "cifar10_full_test.prototxt"
# The train/test net protocol buffer definition
net: "cifar10_full_train_test.prototxt"
# test_iter specifies how many forward passes the test should carry out.
# In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
# covering the full 10,000 testing images.
Expand Down
6 changes: 2 additions & 4 deletions examples/cifar10/cifar10_full_solver_lr2.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# reduce learning rate after 120 epochs (60000 iters) by factor 0f 10
# then another factor of 10 after 10 more epochs (5000 iters)

# The training protocol buffer definition
train_net: "cifar10_full_train.prototxt"
# The testing protocol buffer definition
test_net: "cifar10_full_test.prototxt"
# The train/test net protocol buffer definition
net: "cifar10_full_train_test.prototxt"
# test_iter specifies how many forward passes the test should carry out.
# In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
# covering the full 10,000 testing images.
Expand Down
174 changes: 0 additions & 174 deletions examples/cifar10/cifar10_full_train.prototxt
View file
Open in desktop

This file was deleted.

16 changes: 15 additions & 1 deletion examples/cifar10/cifar10_full_test.prototxt → .../cifar10/cifar10_full_train_test.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
name: "CIFAR10_full_test"
name: "CIFAR10_full"
layers {
name: "cifar"
type: DATA
top: "data"
top: "label"
data_param {
source: "cifar10-leveldb/cifar-train-leveldb"
mean_file: "mean.binaryproto"
batch_size: 100
}
include: { phase: TRAIN }
}
layers {
name: "cifar"
type: DATA
Expand All @@ -9,6 +21,7 @@ layers {
mean_file: "mean.binaryproto"
batch_size: 100
}
include: { phase: TEST }
}
layers {
name: "conv1"
Expand Down Expand Up @@ -172,6 +185,7 @@ layers {
bottom: "ip1"
bottom: "label"
top: "accuracy"
include: { phase: TEST }
}
layers {
name: "loss"
Expand Down
6 changes: 2 additions & 4 deletions examples/cifar10/cifar10_quick_solver.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# reduce the learning rate after 8 epochs (4000 iters) by a factor of 10

# The training protocol buffer definition
train_net: "cifar10_quick_train.prototxt"
# The testing protocol buffer definition
test_net: "cifar10_quick_test.prototxt"
# The train/test net protocol buffer definition
net: "cifar10_quick_train_test.prototxt"
# test_iter specifies how many forward passes the test should carry out.
# In the case of MNIST, we have test batch size 100 and 100 test iterations,
# covering the full 10,000 testing images.
Expand Down
6 changes: 2 additions & 4 deletions examples/cifar10/cifar10_quick_solver_lr1.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# reduce the learning rate after 8 epochs (4000 iters) by a factor of 10

# The training protocol buffer definition
train_net: "cifar10_quick_train.prototxt"
# The testing protocol buffer definition
test_net: "cifar10_quick_test.prototxt"
# The train/test net protocol buffer definition
net: "cifar10_quick_train_test.prototxt"
# test_iter specifies how many forward passes the test should carry out.
# In the case of MNIST, we have test batch size 100 and 100 test iterations,
# covering the full 10,000 testing images.
Expand Down
Loading