Skip to content

Commit e6c80da

Browse files
committed
Upgrade existing nets using upgrade_net_proto_text tool
Restore comments afterwards
1 parent 11a4c16 commit e6c80da

23 files changed

+3661
-2732
lines changed

examples/cifar10/cifar10_full.prototxt

+48-36
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,27 @@ input_dim: 1
66
input_dim: 3
77
input_dim: 32
88
input_dim: 32
9-
layers {
9+
layer {
1010
name: "conv1"
11-
type: CONVOLUTION
11+
type: "Convolution"
1212
bottom: "data"
1313
top: "conv1"
14-
blobs_lr: 1
15-
blobs_lr: 2
14+
param {
15+
lr_mult: 1
16+
}
17+
param {
18+
lr_mult: 2
19+
}
1620
convolution_param {
1721
num_output: 32
1822
pad: 2
1923
kernel_size: 5
2024
stride: 1
2125
}
2226
}
23-
layers {
27+
layer {
2428
name: "pool1"
25-
type: POOLING
29+
type: "Pooling"
2630
bottom: "conv1"
2731
top: "pool1"
2832
pooling_param {
@@ -31,47 +35,51 @@ layers {
3135
stride: 2
3236
}
3337
}
34-
layers {
38+
layer {
3539
name: "relu1"
36-
type: RELU
40+
type: "ReLU"
3741
bottom: "pool1"
3842
top: "pool1"
3943
}
40-
layers {
44+
layer {
4145
name: "norm1"
42-
type: LRN
46+
type: "LRN"
4347
bottom: "pool1"
4448
top: "norm1"
4549
lrn_param {
46-
norm_region: WITHIN_CHANNEL
4750
local_size: 3
4851
alpha: 5e-05
4952
beta: 0.75
53+
norm_region: WITHIN_CHANNEL
5054
}
5155
}
52-
layers {
56+
layer {
5357
name: "conv2"
54-
type: CONVOLUTION
58+
type: "Convolution"
5559
bottom: "norm1"
5660
top: "conv2"
57-
blobs_lr: 1
58-
blobs_lr: 2
61+
param {
62+
lr_mult: 1
63+
}
64+
param {
65+
lr_mult: 2
66+
}
5967
convolution_param {
6068
num_output: 32
6169
pad: 2
6270
kernel_size: 5
6371
stride: 1
6472
}
6573
}
66-
layers {
74+
layer {
6775
name: "relu2"
68-
type: RELU
76+
type: "ReLU"
6977
bottom: "conv2"
7078
top: "conv2"
7179
}
72-
layers {
80+
layer {
7381
name: "pool2"
74-
type: POOLING
82+
type: "Pooling"
7583
bottom: "conv2"
7684
top: "pool2"
7785
pooling_param {
@@ -80,21 +88,21 @@ layers {
8088
stride: 2
8189
}
8290
}
83-
layers {
91+
layer {
8492
name: "norm2"
85-
type: LRN
93+
type: "LRN"
8694
bottom: "pool2"
8795
top: "norm2"
8896
lrn_param {
89-
norm_region: WITHIN_CHANNEL
9097
local_size: 3
9198
alpha: 5e-05
9299
beta: 0.75
100+
norm_region: WITHIN_CHANNEL
93101
}
94102
}
95-
layers {
103+
layer {
96104
name: "conv3"
97-
type: CONVOLUTION
105+
type: "Convolution"
98106
bottom: "norm2"
99107
top: "conv3"
100108
convolution_param {
@@ -104,15 +112,15 @@ layers {
104112
stride: 1
105113
}
106114
}
107-
layers {
115+
layer {
108116
name: "relu3"
109-
type: RELU
117+
type: "ReLU"
110118
bottom: "conv3"
111119
top: "conv3"
112120
}
113-
layers {
121+
layer {
114122
name: "pool3"
115-
type: POOLING
123+
type: "Pooling"
116124
bottom: "conv3"
117125
top: "pool3"
118126
pooling_param {
@@ -121,22 +129,26 @@ layers {
121129
stride: 2
122130
}
123131
}
124-
layers {
132+
layer {
125133
name: "ip1"
126-
type: INNER_PRODUCT
134+
type: "InnerProduct"
127135
bottom: "pool3"
128136
top: "ip1"
129-
blobs_lr: 1
130-
blobs_lr: 2
131-
weight_decay: 250
132-
weight_decay: 0
137+
param {
138+
lr_mult: 1
139+
decay_mult: 250
140+
}
141+
param {
142+
lr_mult: 2
143+
decay_mult: 0
144+
}
133145
inner_product_param {
134146
num_output: 10
135147
}
136148
}
137-
layers {
149+
layer {
138150
name: "prob"
139-
type: SOFTMAX
151+
type: "Softmax"
140152
bottom: "ip1"
141153
top: "prob"
142154
}

0 commit comments

Comments
 (0)