Merge pull request #959 from nickcarlevaris/contrastive_loss
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 19 Sep 2014 04:37:31 +0000 (21:37 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 19 Sep 2014 04:37:31 +0000 (21:37 -0700)
commit7c3c089a59c9f0301ec57a2b1317c588e2be5a8e
tree82944993acae891221358a6a48713106f4c8940e
parente146423f2d5454a2229ad642706b57a7e7f9ed70
parentd149c9a98d783eb64cefbbfeb02c6859dd81cfa6
Merge pull request #959 from nickcarlevaris/contrastive_loss

  Add contrastive loss layer, tests, and a siamese network example
include/caffe/loss_layers.hpp
src/caffe/proto/caffe.proto