Merge pull request BVLC#1639 from longjon/crop-layer

Crop layer for automatically aligning computations

include/caffe/common_layers.hpp

@@ -91,6 +91,9 @@ class ConcatLayer : public Layer<Dtype> {
  }
  virtual inline int MinBottomBlobs() const { return 2; }
  virtual inline int ExactNumTopBlobs() const { return 1; }
+ virtual inline DiagonalAffineMap<Dtype> coord_map() {
+ return DiagonalAffineMap<Dtype>::identity(2);
+ }
 
  protected:
  /**
@@ -171,6 +174,9 @@ class EltwiseLayer : public Layer<Dtype> {
  }
  virtual inline int MinBottomBlobs() const { return 2; }
  virtual inline int ExactNumTopBlobs() const { return 1; }
+ virtual inline DiagonalAffineMap<Dtype> coord_map() {
+ return DiagonalAffineMap<Dtype>::identity(2);
+ }
 
  protected:
  virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
@@ -301,6 +307,9 @@ class MVNLayer : public Layer<Dtype> {
  }
  virtual inline int ExactNumBottomBlobs() const { return 1; }
  virtual inline int ExactNumTopBlobs() const { return 1; }
+ virtual inline DiagonalAffineMap<Dtype> coord_map() {
+ return DiagonalAffineMap<Dtype>::identity(2);
+ }
 
  protected:
  virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
@@ -367,6 +376,9 @@ class SoftmaxLayer : public Layer<Dtype> {
  }
  virtual inline int ExactNumBottomBlobs() const { return 1; }
  virtual inline int ExactNumTopBlobs() const { return 1; }
+ virtual inline DiagonalAffineMap<Dtype> coord_map() {
+ return DiagonalAffineMap<Dtype>::identity(2);
+ }
 
  protected:
  virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
@@ -431,6 +443,9 @@ class SplitLayer : public Layer<Dtype> {
  }
  virtual inline int ExactNumBottomBlobs() const { return 1; }
  virtual inline int MinTopBlobs() const { return 1; }
+ virtual inline DiagonalAffineMap<Dtype> coord_map() {
+ return DiagonalAffineMap<Dtype>::identity(2);
+ }
 
  protected:
  virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
@@ -466,6 +481,9 @@ class SliceLayer : public Layer<Dtype> {
  }
  virtual inline int ExactNumBottomBlobs() const { return 1; }
  virtual inline int MinTopBlobs() const { return 2; }
+ virtual inline DiagonalAffineMap<Dtype> coord_map() {
+ return DiagonalAffineMap<Dtype>::identity(2);
+ }
 
  protected:
  virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,

include/caffe/layer.hpp

@@ -3,16 +3,20 @@
 
 #include <algorithm>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "caffe/blob.hpp"
 #include "caffe/common.hpp"
 #include "caffe/layer_factory.hpp"
 #include "caffe/proto/caffe.pb.h"
+#include "caffe/util/coords.hpp"
 #include "caffe/util/device_alternate.hpp"
 
 namespace caffe {
 
+template <typename Dtype> class Net;
+
 /**
  * @brief An interface for the units of computation which can be composed into a
  * Net.
@@ -293,6 +297,16 @@ class Layer {
  param_propagate_down_[param_id] = value;
  }
 
+ virtual DiagonalAffineMap<Dtype> coord_map() {
+ NOT_IMPLEMENTED;
+ // suppress warnings
+ return DiagonalAffineMap<Dtype>(vector<pair<Dtype, Dtype> >());
+ }
+
+ /**
+ * @brief Used by Net to give layers a pointer to their owning net.
+ */
+ void set_net(Net<Dtype>* net) { net_ = net; }
 
  protected:
  /** The protobuf that stores the layer parameters */
@@ -306,6 +320,9 @@ class Layer {
  * the objective function. */
  vector<Dtype> loss_;
 
+ /** The net to which this layer belongs. */
+ Net<Dtype>* net_;
+
  /** @brief Using the CPU device, compute the layer output. */
  virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
  const vector<Blob<Dtype>*>& top) = 0;

include/caffe/neuron_layers.hpp

@@ -34,6 +34,9 @@ class NeuronLayer : public Layer<Dtype> {
  }
  virtual inline int ExactNumBottomBlobs() const { return 1; }
  virtual inline int ExactNumTopBlobs() const { return 1; }
+ virtual inline DiagonalAffineMap<Dtype> coord_map() {
+ return DiagonalAffineMap<Dtype>::identity(2);
+ }
 };
 
 /**

include/caffe/util/coords.hpp

@@ -0,0 +1,61 @@
+#ifndef CAFFE_UTIL_COORDS_H_
+#define CAFFE_UTIL_COORDS_H_
+
+#include <algorithm>
+#include <utility>
+#include <vector>
+
+namespace caffe {
+
+template <typename Dtype>
+class DiagonalAffineMap {
+ public:
+ explicit DiagonalAffineMap(const vector<pair<Dtype, Dtype> > coefs)
+ : coefs_(coefs) { }
+ static DiagonalAffineMap identity(const int nd) {
+ return DiagonalAffineMap(vector<pair<Dtype, Dtype> >(nd, make_pair(1, 0)));
+ }
+
+ inline DiagonalAffineMap compose(const DiagonalAffineMap& other) const {
+ CHECK_EQ(coefs_.size(), other.coefs_.size())
+ << "Attempt to compose DiagonalAffineMaps of different dimensions";
+ DiagonalAffineMap<Dtype> out;
+ transform(coefs_.begin(), coefs_.end(), other.coefs_.begin(),
+ std::back_inserter(out.coefs_), &compose_coefs);
+ return out;
+ }
+ inline DiagonalAffineMap inv() const {
+ DiagonalAffineMap<Dtype> out;
+ transform(coefs_.begin(), coefs_.end(), std::back_inserter(out.coefs_),
+ &inv_coefs);
+ return out;
+ }
+ inline vector<pair<Dtype, Dtype> > coefs() { return coefs_; }
+
+ private:
+ DiagonalAffineMap() { }
+ static inline pair<Dtype, Dtype> compose_coefs(pair<Dtype, Dtype> left,
+ pair<Dtype, Dtype> right) {
+ return make_pair(left.first * right.first,
+ left.first * right.second + left.second);
+ }
+ static inline pair<Dtype, Dtype> inv_coefs(pair<Dtype, Dtype> coefs) {
+ return make_pair(1 / coefs.first, - coefs.second / coefs.first);
+ }
+ vector<pair<Dtype, Dtype> > coefs_;
+};
+
+template <typename Dtype>
+DiagonalAffineMap<Dtype> FilterMap(const int kernel_h, const int kernel_w,
+ const int stride_h, const int stride_w, const int pad_h, const int pad_w) {
+ vector<pair<Dtype, Dtype> > coefs;
+ coefs.push_back(make_pair(stride_h,
+ static_cast<Dtype>(kernel_h - 1) / 2 - pad_h));
+ coefs.push_back(make_pair(stride_w,
+ static_cast<Dtype>(kernel_w - 1) / 2 - pad_w));
+ return DiagonalAffineMap<Dtype>(coefs);
+}
+
+} // namespace caffe
+
+#endif // CAFFE_UTIL_COORDS_H_