projects / platform / upstream / caffeonacl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b258956) | patch
note the last added layer/params in caffe.proto to prevent conflicts
authorJonathan L Long <jonlong@cs.berkeley.edu>
Wed, 30 Apr 2014 19:28:55 +0000 (12:28 -0700)
committerJonathan L Long <jonlong@cs.berkeley.edu>
Wed, 30 Apr 2014 19:28:55 +0000 (12:28 -0700)
commitb2b1e9951cffcc35b2228fb11c7a9cbbc231cbf3
tree6602695d93ea4621e147acf3bada9dfbb915750etree | snapshot
parentb2589569d257c8b6a90d5333065194e0eab01e83commit | diff
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.
src/caffe/proto/caffe.proto diff | blob | history
Domain: Machine Learning / ML Framework;