projects / platform / upstream / caffe.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e146423 d149c9a)
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)
  Add contrastive loss layer, tests, and a siamese network example

1  2 
include/caffe/loss_layers.hpp patch | diff1 | diff2 | blob | history
src/caffe/proto/caffe.proto patch | diff1 | diff2 | blob | history

diff --cc include/caffe/loss_layers.hpp
Simple merge
diff --cc src/caffe/proto/caffe.proto
Simple merge
Domain: Machine Learning / ML Framework;