From 3f555001db1b4a862931abeff85c2c33bb36149b Mon Sep 17 00:00:00 2001
From: hedaoyuan <hedaoyuan@github.com>
Date: Mon, 4 Sep 2017 16:16:33 +0800
Subject: [PATCH] Add im2col test.

---
 paddle/operators/math/im2col.h       |  2 +-
 paddle/operators/math/im2col_test.cc | 88 ++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 paddle/operators/math/im2col_test.cc

diff --git a/paddle/operators/math/im2col.h b/paddle/operators/math/im2col.h
index 1065cd3d85e..8958c5457cc 100644
--- a/paddle/operators/math/im2col.h
+++ b/paddle/operators/math/im2col.h
@@ -22,7 +22,7 @@ namespace operators {
 namespace math {
 
 /* The storage format of the coldata in the Im2ColFunctor and Col2ImFunctor. */
-enum ColFormat { kCFO = 0, kOCF = 1 };
+enum class ColFormat { kCFO = 0, kOCF = 1 };
 
 /*
  * \brief Converts the image data of three dimensions(CHW) into a colData of
diff --git a/paddle/operators/math/im2col_test.cc b/paddle/operators/math/im2col_test.cc
new file mode 100644
index 00000000000..4a9deb72102
--- /dev/null
+++ b/paddle/operators/math/im2col_test.cc
@@ -0,0 +1,88 @@
+/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. */
+
+#include "paddle/operators/math/im2col.h"
+#include <gtest/gtest.h>
+#include <iostream>
+
+TEST(math, im2col) {
+  paddle::framework::Tensor input;
+  paddle::framework::Tensor output_cfo;
+  paddle::framework::Tensor output_ocf;
+  paddle::framework::Tensor input_check;
+
+  int input_height = 2;
+  int input_width = 3;
+  int filter_size = 2;
+  int stride = 1;
+  int padding = 0;
+  int output_height = (input_height - filter_size + 2 * padding) / stride + 1;
+  int output_width = (input_width - filter_size + 2 * padding) / stride + 1;
+
+  /**
+   * input = [0, 1, 2,
+   *          3, 4, 5]
+   *
+   * output_cfo = [0, 1
+   *               1, 2
+   *               3, 4
+   *               4, 5]
+   *
+   * output_ocf = [0, 1, 3, 4
+   *               1, 2, 4, 5]
+   */
+  auto* cpu_place = new paddle::platform::CPUPlace();
+  float* input_ptr =
+      input.mutable_data<float>({1, input_height, input_width}, *cpu_place);
+  float arr[6] = {0, 1, 2, 3, 4, 5};
+  memcpy(input_ptr, arr, 6 * sizeof(float));
+  output_cfo.mutable_data<float>(
+      {1, filter_size, filter_size, output_height, output_width}, *cpu_place);
+  output_ocf.mutable_data<float>(
+      {output_height, output_width, 1, filter_size, filter_size}, *cpu_place);
+
+  paddle::operators::math::Im2ColFunctor<
+      paddle::operators::math::ColFormat::kCFO, paddle::platform::CPUPlace,
+      float>
+      im2col;
+  paddle::operators::math::Im2ColFunctor<
+      paddle::operators::math::ColFormat::kOCF, paddle::platform::CPUPlace,
+      float>
+      im2col_ocf;
+
+  paddle::platform::DeviceContext* context =
+      new paddle::platform::CPUDeviceContext(*cpu_place);
+  im2col(input, output_cfo, stride, stride, padding, padding, context);
+  im2col_ocf(input, output_ocf, stride, stride, padding, padding, context);
+
+  float* out_cfo_ptr = output_cfo.data<float>();
+  EXPECT_EQ(out_cfo_ptr[0], 0);
+  EXPECT_EQ(out_cfo_ptr[1], 1);
+  EXPECT_EQ(out_cfo_ptr[2], 1);
+  EXPECT_EQ(out_cfo_ptr[3], 2);
+  EXPECT_EQ(out_cfo_ptr[4], 3);
+  EXPECT_EQ(out_cfo_ptr[5], 4);
+  EXPECT_EQ(out_cfo_ptr[6], 4);
+  EXPECT_EQ(out_cfo_ptr[7], 5);
+
+  float* out_ocf_ptr = output_ocf.data<float>();
+  EXPECT_EQ(out_ocf_ptr[0], 0);
+  EXPECT_EQ(out_ocf_ptr[1], 1);
+  EXPECT_EQ(out_ocf_ptr[2], 3);
+  EXPECT_EQ(out_ocf_ptr[3], 4);
+  EXPECT_EQ(out_ocf_ptr[4], 1);
+  EXPECT_EQ(out_ocf_ptr[5], 2);
+  EXPECT_EQ(out_ocf_ptr[6], 4);
+  EXPECT_EQ(out_ocf_ptr[7], 5);
+}
-- 
GitLab