Merge pull request #1654 from longjon/softmax-missing-values

Add missing value support to SoftmaxLossLayer

diff --cc include/caffe/loss_layers.hpp
index 4350136,ca91579..600a13b
--- 1/include/caffe/loss_layers.hpp
--- 2/include/caffe/loss_layers.hpp
+++ b/include/caffe/loss_layers.hpp
@@@ -696,8 -696,17 +696,16 @@@ template <typename Dtype> class Softmax
  template <typename Dtype>
  class SoftmaxWithLossLayer : public LossLayer<Dtype> {
   public:
+    /**
+     * @param param provides LossParameter loss_param, with options:
+     *  - ignore_label (optional)
+     *    Specify a label value that should be ignored when computing the loss.
+     *  - normalize (optional, default true)
+     *    If true, the loss is normalized by the number of (nonignored) labels
+     *    present; otherwise the loss is simply summed over spatial locations.
+     */
    explicit SoftmaxWithLossLayer(const LayerParameter& param)
 -      : LossLayer<Dtype>(param),
 -        softmax_layer_(new SoftmaxLayer<Dtype>(param)) {}
 +      : LossLayer<Dtype>(param) {}
    virtual void LayerSetUp(const vector<Blob<Dtype>*>& bottom,
        const vector<Blob<Dtype>*>& top);
    virtual void Reshape(const vector<Blob<Dtype>*>& bottom,

diff --cc src/caffe/layers/softmax_loss_layer.cpp
Simple merge

diff --cc src/caffe/proto/caffe.proto
Simple merge