forked from BVLC/caffe
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added a Reshape layer for copying-free modification of blob dimensions.
- Loading branch information
1 parent
35a5df5
commit 4fb3c9e
Showing
6 changed files
with
348 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| #include <vector> | ||
|
|
||
| #include "caffe/common_layers.hpp" | ||
| #include "caffe/layer.hpp" | ||
|
|
||
| namespace caffe { | ||
|
|
||
| template <typename Dtype> | ||
| void ReshapeLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom, | ||
| const vector<Blob<Dtype>*>& top) { | ||
| CHECK_EQ(bottom.size(), 1) << "Reshape Layer takes a single blob as input."; | ||
| CHECK_EQ(top.size(), 1) << "Reshape Layer takes a single blob as output."; | ||
|
|
||
| num_out = this->layer_param_.reshape_param().num(); | ||
| // Dimensions set to 0 (either by default or explicitly) will be copied from | ||
| // the bottom layer. | ||
| if (num_out == 0) { | ||
| num_out = bottom[0]->num(); | ||
| } | ||
|
|
||
| channels_out = this->layer_param_.reshape_param().channels(); | ||
| if (channels_out == 0) { | ||
| channels_out = bottom[0]->channels(); | ||
| } | ||
|
|
||
| width_out = this->layer_param_.reshape_param().width(); | ||
| if (width_out == 0) { | ||
| width_out = bottom[0]->width(); | ||
| } | ||
|
|
||
| height_out = this->layer_param_.reshape_param().height(); | ||
| if (height_out == 0) { | ||
| height_out = bottom[0]->height(); | ||
| } | ||
|
|
||
| FillInSingleUnspecifiedDimension(bottom[0]->count()); | ||
| } | ||
|
|
||
| template <typename Dtype> | ||
| void ReshapeLayer<Dtype>::Reshape(const vector<Blob<Dtype>*>& bottom, | ||
| const vector<Blob<Dtype>*>& top) { | ||
| top[0]->Reshape(num_out, channels_out, height_out, width_out); | ||
|
|
||
| const size_t out_count = num_out * channels_out * height_out * width_out; | ||
| CHECK_EQ(out_count, bottom[0]->count()) << | ||
| "Bottom layer count isn't equal to predicted; output layer size is " << | ||
| num_out << "x" << channels_out << "x" << height_out << "x" << width_out; | ||
| } | ||
|
|
||
| template <typename Dtype> | ||
| void ReshapeLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, | ||
| const vector<Blob<Dtype>*>& top) { | ||
| top[0]->ShareData(*bottom[0]); | ||
| } | ||
|
|
||
| template <typename Dtype> | ||
| void ReshapeLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top, | ||
| const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) { | ||
| bottom[0]->ShareDiff(*top[0]); | ||
| } | ||
|
|
||
| /** | ||
| * @brief Fill in a single dimension left unspecified. | ||
| * | ||
| * If a dimension is set to -1, it will be filled in with a value inferred from | ||
| * the count of the bottom layer (if the product of the nonzero dimensions is a | ||
| * divisor of the count). | ||
| * | ||
| * @param bottom_count Count of the bottom layer. | ||
| */ | ||
| template <typename Dtype> | ||
| void ReshapeLayer<Dtype>::FillInSingleUnspecifiedDimension(int bottom_count) { | ||
| int* const dimensions[] = {&num_out, &channels_out, &width_out, &height_out}; | ||
| const size_t N_DIMENSIONS = 4; | ||
|
|
||
| // How many -1 dimensions do we have. | ||
| int n_unspecified = 0; | ||
| // Product of the remaining dimensions. | ||
| int product_without_unspecified_dim = 1; | ||
|
|
||
| for (size_t i = 0; i < N_DIMENSIONS; i++) { | ||
| if (*(dimensions[i]) == -1) { | ||
| n_unspecified++; | ||
| } else { | ||
| product_without_unspecified_dim *= *(dimensions[i]); | ||
| } | ||
| } | ||
|
|
||
| if (n_unspecified == 0) { | ||
| // Everything is filled out, nothing to do. | ||
| return; | ||
| } | ||
|
|
||
| CHECK_EQ(n_unspecified, 1) << "Only one dimension can be set -1."; | ||
| CHECK_EQ(bottom_count % product_without_unspecified_dim, 0) << | ||
| "Bottom layer count " << bottom_count << " not divisible by product " << | ||
| product_without_unspecified_dim; | ||
|
|
||
| // Fill up the one remaining dimension. | ||
| for (size_t i = 0; i < N_DIMENSIONS; i++) { | ||
| if (*(dimensions[i]) == -1) { | ||
| *(dimensions[i]) = bottom_count / product_without_unspecified_dim; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #ifdef CPU_ONLY | ||
| STUB_GPU(ReshapeLayer); | ||
| #endif | ||
|
|
||
| INSTANTIATE_CLASS(ReshapeLayer); | ||
| REGISTER_LAYER_CLASS(RESHAPE, ReshapeLayer); | ||
| } // namespace caffe |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #include <vector> | ||
|
|
||
| #include "caffe/common_layers.hpp" | ||
| #include "caffe/layer.hpp" | ||
| #include "caffe/util/math_functions.hpp" | ||
|
|
||
| namespace caffe { | ||
|
|
||
| template <typename Dtype> | ||
| void ReshapeLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom, | ||
| const vector<Blob<Dtype>*>& top) { | ||
| top[0]->ShareData(*bottom[0]); | ||
| } | ||
|
|
||
| template <typename Dtype> | ||
| void ReshapeLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top, | ||
| const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) { | ||
| bottom[0]->ShareDiff(*top[0]); | ||
| } | ||
|
|
||
| INSTANTIATE_LAYER_GPU_FUNCS(ReshapeLayer); | ||
|
|
||
| } // namespace caffe |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| #include <cstring> | ||
| #include <vector> | ||
|
|
||
| #include "gtest/gtest.h" | ||
|
|
||
| #include "caffe/blob.hpp" | ||
| #include "caffe/common.hpp" | ||
| #include "caffe/common_layers.hpp" | ||
| #include "caffe/filler.hpp" | ||
|
|
||
| #include "caffe/test/test_caffe_main.hpp" | ||
| #include "caffe/test/test_gradient_check_util.hpp" | ||
|
|
||
| namespace caffe { | ||
|
|
||
| template <typename TypeParam> | ||
| class ReshapeLayerTest : public MultiDeviceTest<TypeParam> { | ||
| typedef typename TypeParam::Dtype Dtype; | ||
| protected: | ||
| ReshapeLayerTest() | ||
| : blob_bottom_(new Blob<Dtype>(2, 3, 6, 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 ~ReshapeLayerTest() { 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_; | ||
| }; | ||
|
|
||
| TYPED_TEST_CASE(ReshapeLayerTest, TestDtypesAndDevices); | ||
|
|
||
| TYPED_TEST(ReshapeLayerTest, TestFlattenOutputSizes) { | ||
| typedef typename TypeParam::Dtype Dtype; | ||
| LayerParameter layer_param; | ||
| ReshapeParameter* reshape_param = | ||
| layer_param.mutable_reshape_param(); | ||
| reshape_param->set_channels(-1); | ||
| reshape_param->set_height(1); | ||
| reshape_param->set_width(1); | ||
|
|
||
| ReshapeLayer<Dtype> layer(layer_param); | ||
| layer.SetUp(this->blob_bottom_vec_, this->blob_top_vec_); | ||
| EXPECT_EQ(this->blob_top_->num(), 2); | ||
| EXPECT_EQ(this->blob_top_->channels(), 3 * 6 * 5); | ||
| EXPECT_EQ(this->blob_top_->height(), 1); | ||
| EXPECT_EQ(this->blob_top_->width(), 1); | ||
| } | ||
|
|
||
| TYPED_TEST(ReshapeLayerTest, TestFlattenValues) { | ||
| typedef typename TypeParam::Dtype Dtype; | ||
| LayerParameter layer_param; | ||
| ReshapeParameter* reshape_param = | ||
| layer_param.mutable_reshape_param(); | ||
| reshape_param->set_channels(-1); | ||
| reshape_param->set_height(1); | ||
| reshape_param->set_width(1); | ||
| ReshapeLayer<Dtype> layer(layer_param); | ||
| layer.SetUp(this->blob_bottom_vec_, this->blob_top_vec_); | ||
| layer.Forward(this->blob_bottom_vec_, this->blob_top_vec_); | ||
| for (int c = 0; c < 3 * 6 * 5; ++c) { | ||
| EXPECT_EQ(this->blob_top_->data_at(0, c, 0, 0), | ||
| this->blob_bottom_->data_at(0, c / (6 * 5), (c / 5) % 6, c % 5)); | ||
| EXPECT_EQ(this->blob_top_->data_at(1, c, 0, 0), | ||
| this->blob_bottom_->data_at(1, c / (6 * 5), (c / 5) % 6, c % 5)); | ||
| } | ||
| } | ||
|
|
||
| // Test whether setting output dimensions to 0 either explicitly or implicitly | ||
| // copies the respective dimension of the input layer. | ||
| TYPED_TEST(ReshapeLayerTest, TestCopyDimensions) { | ||
| typedef typename TypeParam::Dtype Dtype; | ||
| LayerParameter layer_param; | ||
| ReshapeParameter* reshape_param = | ||
| layer_param.mutable_reshape_param(); | ||
| // Omitting num to test implicit zeroes. | ||
| reshape_param->set_channels(0); | ||
| reshape_param->set_height(0); | ||
| reshape_param->set_width(0); | ||
| ReshapeLayer<Dtype> layer(layer_param); | ||
| layer.SetUp(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(), 5); | ||
| } | ||
|
|
||
| // When a dimension is set to -1, we should infer its value from the other | ||
| // dimensions (including those that get copied from below). | ||
| TYPED_TEST(ReshapeLayerTest, TestInferenceOfUnspecified) { | ||
| typedef typename TypeParam::Dtype Dtype; | ||
| LayerParameter layer_param; | ||
| ReshapeParameter* reshape_param = | ||
| layer_param.mutable_reshape_param(); | ||
| // Since omitted, num is implicitly set to 0 (thus, copies 2). | ||
| reshape_param->set_channels(3); | ||
| reshape_param->set_height(10); | ||
| reshape_param->set_width(-1); | ||
|
|
||
| // Count is 180, thus height should be 180 / (2*3*10) = 3. | ||
|
|
||
| ReshapeLayer<Dtype> layer(layer_param); | ||
| layer.SetUp(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(), 10); | ||
| EXPECT_EQ(this->blob_top_->width(), 3); | ||
| } | ||
|
|
||
| } // namespace caffe |