Skip to content

Commit 11a4c16

Browse files
committed
start layer parameter field IDs at 100
(always want them printed at the end, and want to allow more fields to be added in the future, so reserve fields 10-99 for that purpose)
1 parent 62d1d3a commit 11a4c16

File tree

1 file changed

+35
-34
lines changed

1 file changed

+35
-34
lines changed

src/caffe/proto/caffe.proto

+35-34
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ message ParamSpec {
241241
// NOTE
242242
// Update the next available ID when you add a new LayerParameter field.
243243
//
244-
// LayerParameter next available ID: 43 (last added: loss_param)
244+
// LayerParameter next available layer-specific ID: 129 (last added: window_data_param)
245245
message LayerParameter {
246246
optional string name = 1; // the layer name
247247
optional string type = 2; // the layer type
@@ -266,48 +266,49 @@ message LayerParameter {
266266
// specified, the layer is always included. If the current NetState meets
267267
// ANY (i.e., one or more) of the specified rules, the layer is
268268
// included/excluded.
269-
repeated NetStateRule include = 11;
270-
repeated NetStateRule exclude = 12;
269+
repeated NetStateRule include = 8;
270+
repeated NetStateRule exclude = 9;
271271

272272
// Parameters for data pre-processing.
273-
optional TransformationParameter transform_param = 13;
274-
275-
optional AccuracyParameter accuracy_param = 14;
276-
optional ArgMaxParameter argmax_param = 15;
277-
optional ConcatParameter concat_param = 16;
278-
optional ContrastiveLossParameter contrastive_loss_param = 17;
279-
optional ConvolutionParameter convolution_param = 18;
280-
optional DataParameter data_param = 19;
281-
optional DropoutParameter dropout_param = 20;
282-
optional DummyDataParameter dummy_data_param = 21;
283-
optional EltwiseParameter eltwise_param = 22;
284-
optional ExpParameter exp_param = 23;
285-
optional HDF5DataParameter hdf5_data_param = 24;
286-
optional HDF5OutputParameter hdf5_output_param = 25;
287-
optional HingeLossParameter hinge_loss_param = 26;
288-
optional ImageDataParameter image_data_param = 27;
289-
optional InfogainLossParameter infogain_loss_param = 28;
290-
optional InnerProductParameter inner_product_param = 29;
291-
optional LRNParameter lrn_param = 30;
292-
optional MemoryDataParameter memory_data_param = 31;
293-
optional MVNParameter mvn_param = 32;
294-
optional PoolingParameter pooling_param = 33;
295-
optional PowerParameter power_param = 34;
296-
optional ReLUParameter relu_param = 35;
297-
optional SigmoidParameter sigmoid_param = 36;
298-
optional SoftmaxParameter softmax_param = 37;
299-
optional SliceParameter slice_param = 38;
300-
optional TanHParameter tanh_param = 39;
301-
optional ThresholdParameter threshold_param = 40;
302-
optional WindowDataParameter window_data_param = 41;
273+
optional TransformationParameter transform_param = 100;
303274

304275
// Parameters shared by loss layers.
305-
optional LossParameter loss_param = 42;
276+
optional LossParameter loss_param = 101;
306277

278+
// Layer type-specific parameters.
279+
//
307280
// Note: certain layers may have more than one computational engine
308281
// for their implementation. These layers include an Engine type and
309282
// engine parameter for selecting the implementation.
310283
// The default for the engine is set by the ENGINE switch at compile-time.
284+
optional AccuracyParameter accuracy_param = 102;
285+
optional ArgMaxParameter argmax_param = 103;
286+
optional ConcatParameter concat_param = 104;
287+
optional ContrastiveLossParameter contrastive_loss_param = 105;
288+
optional ConvolutionParameter convolution_param = 106;
289+
optional DataParameter data_param = 107;
290+
optional DropoutParameter dropout_param = 108;
291+
optional DummyDataParameter dummy_data_param = 109;
292+
optional EltwiseParameter eltwise_param = 110;
293+
optional ExpParameter exp_param = 111;
294+
optional HDF5DataParameter hdf5_data_param = 112;
295+
optional HDF5OutputParameter hdf5_output_param = 113;
296+
optional HingeLossParameter hinge_loss_param = 114;
297+
optional ImageDataParameter image_data_param = 115;
298+
optional InfogainLossParameter infogain_loss_param = 116;
299+
optional InnerProductParameter inner_product_param = 117;
300+
optional LRNParameter lrn_param = 118;
301+
optional MemoryDataParameter memory_data_param = 119;
302+
optional MVNParameter mvn_param = 120;
303+
optional PoolingParameter pooling_param = 121;
304+
optional PowerParameter power_param = 122;
305+
optional ReLUParameter relu_param = 123;
306+
optional SigmoidParameter sigmoid_param = 124;
307+
optional SoftmaxParameter softmax_param = 125;
308+
optional SliceParameter slice_param = 126;
309+
optional TanHParameter tanh_param = 127;
310+
optional ThresholdParameter threshold_param = 128;
311+
optional WindowDataParameter window_data_param = 129;
311312
}
312313

313314
// Message that stores parameters used to apply transformation

0 commit comments

Comments
 (0)