remove padding_layer and its test

diff --git a/include/caffe/vision_layers.hpp b/include/caffe/vision_layers.hpp
index ca54f2b..5dd3c90 100644 (file)
--- a/include/caffe/vision_layers.hpp
+++ b/include/caffe/vision_layers.hpp
@@ -192,34 +192,6 @@ class InnerProductLayer : public Layer<Dtype> {
   shared_ptr<SyncedMemory> bias_multiplier_;
 };
 
-
-template <typename Dtype>
-class PaddingLayer : public Layer<Dtype> {
- public:
-  explicit PaddingLayer(const LayerParameter& param)
-      : Layer<Dtype>(param) {}
-  virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
-      vector<Blob<Dtype>*>* top);
-
- protected:
-  virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
-      vector<Blob<Dtype>*>* top);
-  virtual void Forward_gpu(const vector<Blob<Dtype>*>& bottom,
-      vector<Blob<Dtype>*>* top);
-  virtual Dtype Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const bool propagate_down, vector<Blob<Dtype>*>* bottom);
-  virtual Dtype Backward_gpu(const vector<Blob<Dtype>*>& top,
-      const bool propagate_down, vector<Blob<Dtype>*>* bottom);
-  unsigned int PAD_;
-  int NUM_;
-  int CHANNEL_;
-  int HEIGHT_IN_;
-  int WIDTH_IN_;
-  int HEIGHT_OUT_;
-  int WIDTH_OUT_;
-};
-
-
 template <typename Dtype>
 class LRNLayer : public Layer<Dtype> {
  public:
@@ -526,4 +498,3 @@ class AccuracyLayer : public Layer<Dtype> {
 }  // namespace caffe
 
 #endif  // CAFFE_VISION_LAYERS_HPP_
-

diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
index ff69c91..8733ff8 100644 (file)
--- a/src/caffe/layer_factory.cpp
+++ b/src/caffe/layer_factory.cpp
@@ -41,8 +41,6 @@ Layer<Dtype>* GetLayer(const LayerParameter& param) {
     return new InnerProductLayer<Dtype>(param);
   } else if (type == "lrn") {
     return new LRNLayer<Dtype>(param);
-  } else if (type == "padding") {
-    return new PaddingLayer<Dtype>(param);
   } else if (type == "pool") {
     return new PoolingLayer<Dtype>(param);
   } else if (type == "relu") {

diff --git a/src/caffe/layers/padding_layer.cu b/src/caffe/layers/padding_layer.cu
deleted file mode 100644 (file)
index 90f5508..0000000
--- a/src/caffe/layers/padding_layer.cu
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2013 Yangqing Jia
-
-#include "caffe/layer.hpp"
-#include "caffe/vision_layers.hpp"
-
-#include <iostream>
-
-namespace caffe {
-
-template <typename Dtype>
-void PaddingLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom,
-      vector<Blob<Dtype>*>* top) {
-  PAD_ = this->layer_param_.pad();
-  CHECK_EQ(bottom.size(), 1) << "Padding Layer takes a single blob as input.";
-  CHECK_EQ(top->size(), 1) << "Padding Layer takes a single blob as output.";
-  NUM_ = bottom[0]->num();
-  CHANNEL_ = bottom[0]->channels();
-  HEIGHT_IN_ = bottom[0]->height();
-  WIDTH_IN_ = bottom[0]->width();
-  HEIGHT_OUT_ = HEIGHT_IN_ + PAD_ * 2;
-  WIDTH_OUT_ = WIDTH_IN_ + PAD_ * 2;
-  (*top)[0]->Reshape(NUM_, CHANNEL_, HEIGHT_OUT_, WIDTH_OUT_);
-
-};
-
-template <typename Dtype>
-void PaddingLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
-      vector<Blob<Dtype>*>* top) {
-  Dtype* top_data = (*top)[0]->mutable_cpu_data();
-  const Dtype* bottom_data = bottom[0]->cpu_data();
-  memset(top_data, 0, sizeof(Dtype) * (*top)[0]->count());
-  // In short, top[n, c, h, w] = bottom[n, c, h-pad, w-pad] if in range
-  for (int n = 0; n < NUM_; ++n) {
-    for (int c = 0; c < CHANNEL_; ++c) {
-      for (int h = 0; h < HEIGHT_IN_; ++h) {
-        // copy the width part
-        memcpy(
-            top_data + ((n * CHANNEL_ + c) * HEIGHT_OUT_ + h + PAD_)
-                * WIDTH_OUT_ + PAD_,
-            bottom_data + ((n * CHANNEL_ + c) * HEIGHT_IN_ + h) * WIDTH_IN_,
-            sizeof(Dtype) * WIDTH_IN_);
-      }
-    }
-  }
-}
-
-template <typename Dtype>
-Dtype PaddingLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top,
-      const bool propagate_down, vector<Blob<Dtype>*>* bottom) {
-  const Dtype* top_diff = top[0]->cpu_diff();
-  Dtype* bottom_diff = (*bottom)[0]->mutable_cpu_diff();
-  //memset(bottom_data, 0, sizeof(Dtype) * (*bottom)[0]->count());
-  for (int n = 0; n < NUM_; ++n) {
-    for (int c = 0; c < CHANNEL_; ++c) {
-      for (int h = 0; h < HEIGHT_IN_; ++h) {
-        // copy the width part
-        memcpy(
-            bottom_diff + ((n * CHANNEL_ + c) * HEIGHT_IN_ + h) * WIDTH_IN_,
-            top_diff + ((n * CHANNEL_ + c) * HEIGHT_OUT_ + h + PAD_)
-                * WIDTH_OUT_ + PAD_,
-            sizeof(Dtype) * WIDTH_IN_);
-      }
-    }
-  }
-  return Dtype(0.);
-}
-
-template <typename Dtype>
-__global__ void PaddingForward(const int count, const Dtype* in, Dtype* out,
-    const int num, const int channel, const int height_in, const int width_in,
-    const int pad) {
-  int index = threadIdx.x + blockIdx.x * blockDim.x;
-  if (index < count) {
-    int height_out = height_in + pad + pad;
-    int width_out = width_in + pad + pad;
-    int w = index % width_in;
-    index /= width_in;
-    int h = index % height_in;
-    index /= height_in;
-    int c = index % channel;
-    index /= channel;
-    out[((index * channel + c) * height_out + h + pad) * width_out + pad + w] =
-        in[((index * channel + c) * height_in + h) * width_in + w];
-  }
-}
-
-template <typename Dtype>
-void PaddingLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom,
-    vector<Blob<Dtype>*>* top) {
-  const Dtype* bottom_data = bottom[0]->gpu_data();
-  Dtype* top_data = (*top)[0]->mutable_gpu_data();
-  const int count = bottom[0]->count();
-  // First, set all data to be zero for the boundary pixels
-  CUDA_CHECK(cudaMemset(top_data, 0, sizeof(Dtype) * (*top)[0]->count()));
-  PaddingForward<Dtype><<<CAFFE_GET_BLOCKS(count), CAFFE_CUDA_NUM_THREADS>>>(
-      count, bottom_data, top_data, NUM_, CHANNEL_, HEIGHT_IN_, WIDTH_IN_,
-      PAD_);
-  CUDA_POST_KERNEL_CHECK;
-}
-
-template <typename Dtype>
-__global__ void PaddingBackward(const int count, const Dtype* in, Dtype* out,
-    const int num, const int channel, const int height_in, const int width_in,
-    const int pad) {
-  int index = threadIdx.x + blockIdx.x * blockDim.x;
-  if (index < count) {
-    int height_out = height_in + pad + pad;
-    int width_out = width_in + pad + pad;
-    int w = index % width_in;
-    index /= width_in;
-    int h = index % height_in;
-    index /= height_in;
-    int c = index % channel;
-    index /= channel;
-    out[((index * channel + c) * height_in + h) * width_in + w] =
-        in[((index * channel + c) * height_out + h + pad) * width_out + pad + w];
-  }
-}
-
-template <typename Dtype>
-Dtype PaddingLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top,
-    const bool propagate_down,
-    vector<Blob<Dtype>*>* bottom) {
-  if (propagate_down) {
-    const Dtype* top_diff = top[0]->gpu_diff();
-    Dtype* bottom_diff = (*bottom)[0]->mutable_gpu_diff();
-    const int count = (*bottom)[0]->count();
-    PaddingBackward<Dtype><<<CAFFE_GET_BLOCKS(count), CAFFE_CUDA_NUM_THREADS>>>(
-        count, top_diff, bottom_diff, NUM_, CHANNEL_, HEIGHT_IN_, WIDTH_IN_,
-        PAD_);
-    CUDA_POST_KERNEL_CHECK;
-  }
-  return Dtype(0);
-}
-
-INSTANTIATE_CLASS(PaddingLayer);
-
-
-}  // namespace caffe

diff --git a/src/caffe/test/test_padding_layer.cpp b/src/caffe/test/test_padding_layer.cpp
deleted file mode 100644 (file)
index da48111..0000000
--- a/src/caffe/test/test_padding_layer.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2013 Yangqing Jia
-
-#include <cstring>
-#include <cuda_runtime.h>
-
-#include "gtest/gtest.h"
-#include "caffe/blob.hpp"
-#include "caffe/common.hpp"
-#include "caffe/filler.hpp"
-#include "caffe/vision_layers.hpp"
-#include "caffe/test/test_gradient_check_util.hpp"
-
-#include "caffe/test/test_caffe_main.hpp"
-
-namespace caffe {
-
-extern cudaDeviceProp CAFFE_TEST_CUDA_PROP;
-
-template <typename Dtype>
-class PaddingLayerTest : public ::testing::Test {
- protected:
-  PaddingLayerTest()
-      : blob_bottom_(new Blob<Dtype>(2, 3, 4, 5)),
-        blob_top_(new Blob<Dtype>()) {
-    // fill the values
-    FillerParameter filler_param;
-    GaussianFiller<Dtype> filler(filler_param);
-    filler.Fill(this->blob_bottom_);
-    blob_bottom_vec_.push_back(blob_bottom_);
-    blob_top_vec_.push_back(blob_top_);
-  };
-  virtual ~PaddingLayerTest() { delete blob_bottom_; delete blob_top_; }
-  Blob<Dtype>* const blob_bottom_;
-  Blob<Dtype>* const blob_top_;
-  vector<Blob<Dtype>*> blob_bottom_vec_;
-  vector<Blob<Dtype>*> blob_top_vec_;
-};
-
-typedef ::testing::Types<float, double> Dtypes;
-TYPED_TEST_CASE(PaddingLayerTest, Dtypes);
-
-TYPED_TEST(PaddingLayerTest, TestCPU) {
-  LayerParameter layer_param;
-  layer_param.set_pad(1);
-  Caffe::set_mode(Caffe::CPU);
-  PaddingLayer<TypeParam> layer(layer_param);
-  layer.SetUp(this->blob_bottom_vec_, &(this->blob_top_vec_));
-  layer.Forward(this->blob_bottom_vec_, &(this->blob_top_vec_));
-  EXPECT_EQ(this->blob_top_->num(), 2);
-  EXPECT_EQ(this->blob_top_->channels(), 3);
-  EXPECT_EQ(this->blob_top_->height(), 6);
-  EXPECT_EQ(this->blob_top_->width(), 7);
-  for (int n = 0; n < 2; ++n) {
-    for (int c = 0; c < 3; ++c) {
-      for (int h = 0; h < 4; ++h) {
-        for (int w = 0; w < 5; ++w) {
-          EXPECT_EQ(this->blob_bottom_->data_at(n, c, h, w),
-              this->blob_top_->data_at(n, c, h + 1, w + 1));
-        }
-      }
-    }
-  }
-}
-
-TYPED_TEST(PaddingLayerTest, TestCPUGrad) {
-  LayerParameter layer_param;
-  layer_param.set_pad(1);
-  Caffe::set_mode(Caffe::CPU);
-  PaddingLayer<TypeParam> layer(layer_param);
-  GradientChecker<TypeParam> checker(1e-2, 1e-3);
-  checker.CheckGradientExhaustive(layer, this->blob_bottom_vec_, this->blob_top_vec_);
-}
-
-TYPED_TEST(PaddingLayerTest, TestGPU) {
-  if (CAFFE_TEST_CUDA_PROP.major >= 2) {
-    LayerParameter layer_param;
-    layer_param.set_pad(1);
-    Caffe::set_mode(Caffe::GPU);
-    PaddingLayer<TypeParam> layer(layer_param);
-    layer.SetUp(this->blob_bottom_vec_, &(this->blob_top_vec_));
-    layer.Forward(this->blob_bottom_vec_, &(this->blob_top_vec_));
-    EXPECT_EQ(this->blob_top_->num(), 2);
-    EXPECT_EQ(this->blob_top_->channels(), 3);
-    EXPECT_EQ(this->blob_top_->height(), 6);
-    EXPECT_EQ(this->blob_top_->width(), 7);
-    for (int n = 0; n < 2; ++n) {
-      for (int c = 0; c < 3; ++c) {
-        for (int h = 0; h < 4; ++h) {
-          for (int w = 0; w < 5; ++w) {
-            EXPECT_EQ(this->blob_bottom_->data_at(n, c, h, w),
-                this->blob_top_->data_at(n, c, h + 1, w + 1));
-          }
-        }
-      }
-    }
-  } else {
-    LOG(ERROR) << "Skipping test (gpu version too low).";
-  }
-}
-
-TYPED_TEST(PaddingLayerTest, TestGPUGrad) {
-  if (CAFFE_TEST_CUDA_PROP.major >= 2) {
-    LayerParameter layer_param;
-    layer_param.set_pad(1);
-    Caffe::set_mode(Caffe::GPU);
-    PaddingLayer<TypeParam> layer(layer_param);
-    GradientChecker<TypeParam> checker(1e-2, 1e-3);
-    checker.CheckGradientExhaustive(layer, this->blob_bottom_vec_, this->blob_top_vec_);
-  } else {
-    LOG(ERROR) << "Skipping test (gpu version too low).";
-  }
-}
-
-}