From: Jonathan L Long <jonlong@cs.berkeley.edu>
Date: Wed, 30 Apr 2014 19:28:55 +0000 (-0700)
Subject: note the last added layer/params in caffe.proto to prevent conflicts
X-Git-Tag: submit/tizen/20180823.020014~692^2~11^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2b1e9951cffcc35b2228fb11c7a9cbbc231cbf3;p=platform%2Fupstream%2Fcaffeonacl.git

note the last added layer/params in caffe.proto to prevent conflicts

The current scheme does not actually prevent conflicts, since three-way
merge will accept simultaneous changes that agree on the next number.
This commit fixes this by explicitly noting the last layer added.
---

diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto
index 0a965c8..e04e42c 100644
--- a/src/caffe/proto/caffe.proto
+++ b/src/caffe/proto/caffe.proto
@@ -99,7 +99,7 @@ message SolverState {
 
 // Update the next available ID when you add a new LayerParameter field.
 //
-// LayerParameter next available ID: 22
+// LayerParameter next available ID: 22 (last added: power_param)
 message LayerParameter {
   repeated string bottom = 2; // the name of the bottom blobs
   repeated string top = 3; // the name of the top blobs
@@ -110,7 +110,7 @@ message LayerParameter {
   // line above the enum. Update the next available ID when you add a new
   // LayerType.
   //
-  // LayerType next available ID: 29
+  // LayerType next available ID: 29 (last added: HINGE_LOSS)
   enum LayerType {
     // "NONE" layer type is 0th enum element so that we don't cause confusion
     // by defaulting to an existent LayerType (instead, should usually error if