Merge HingeLoss and L2HingeLoss by adding hinge_norm to params
authorSergio <sguada@gmail.com>
Sat, 21 Jun 2014 01:26:05 +0000 (18:26 -0700)
committerSergio <sguada@gmail.com>
Sat, 21 Jun 2014 01:26:05 +0000 (18:26 -0700)
commitf2452d8966823bcb993ce64e6045f544d96c3ace
tree326a4cc347aafd9c2b91c0bab1f37f705d75e130
parent3d0bc1acbd98de289f038fd836dbab27ffadb4cc
Merge HingeLoss and L2HingeLoss by adding hinge_norm to params

Conflicts:
src/caffe/layers/loss_layer.cpp
src/caffe/proto/caffe.proto
src/caffe/test/test_l2_hinge_loss_layer.cpp
src/caffe/proto/caffe.proto
src/caffe/test/test_hinge_loss_layer.cpp