From 79e0a26a6472a047ff5b3ebaedc3da6c6eeb6d2a Mon Sep 17 00:00:00 2001
From: guosheng <guosheng@baidu.com>
Date: Fri, 10 Nov 2017 20:03:36 +0800
Subject: [PATCH] Fix test_roi_pool_layer.py

---
 .../protostr/test_roi_pool_layer.protostr     | 55 ++++++++++++++++++-
 .../tests/configs/test_roi_pool_layer.py      | 11 +++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/python/paddle/trainer_config_helpers/tests/configs/protostr/test_roi_pool_layer.protostr b/python/paddle/trainer_config_helpers/tests/configs/protostr/test_roi_pool_layer.protostr
index e8c379b17b..f1bc65b3ae 100644
--- a/python/paddle/trainer_config_helpers/tests/configs/protostr/test_roi_pool_layer.protostr
+++ b/python/paddle/trainer_config_helpers/tests/configs/protostr/test_roi_pool_layer.protostr
@@ -13,12 +13,44 @@ layers {
   size: 10
   active_type: ""
 }
+layers {
+  name: "__conv_0__"
+  type: "exconv"
+  size: 3136
+  active_type: ""
+  inputs {
+    input_layer_name: "data"
+    input_parameter_name: "___conv_0__.w0"
+    conv_conf {
+      filter_size: 3
+      channels: 3
+      stride: 1
+      padding: 1
+      groups: 1
+      filter_channels: 3
+      output_x: 14
+      img_size: 14
+      caffe_mode: true
+      filter_size_y: 3
+      padding_y: 1
+      stride_y: 1
+      output_y: 14
+      img_size_y: 14
+    }
+  }
+  bias_parameter_name: "___conv_0__.wbias"
+  num_filters: 16
+  shared_biases: true
+  height: 14
+  width: 14
+}
 layers {
   name: "__roi_pool_0__"
   type: "roi_pool"
+  size: 784
   active_type: ""
   inputs {
-    input_layer_name: "data"
+    input_layer_name: "__conv_0__"
     roi_pool_conf {
       pooled_width: 7
       pooled_height: 7
@@ -28,6 +60,26 @@ layers {
   inputs {
     input_layer_name: "rois"
   }
+  height: 7
+  width: 7
+}
+parameters {
+  name: "___conv_0__.w0"
+  size: 432
+  initial_mean: 0.0
+  initial_std: 0.272165526976
+  initial_strategy: 0
+  initial_smart: false
+}
+parameters {
+  name: "___conv_0__.wbias"
+  size: 16
+  initial_mean: 0.0
+  initial_std: 0.0
+  dims: 16
+  dims: 1
+  initial_strategy: 0
+  initial_smart: false
 }
 input_layer_names: "data"
 input_layer_names: "rois"
@@ -36,6 +88,7 @@ sub_models {
   name: "root"
   layer_names: "data"
   layer_names: "rois"
+  layer_names: "__conv_0__"
   layer_names: "__roi_pool_0__"
   input_layer_names: "data"
   input_layer_names: "rois"
diff --git a/python/paddle/trainer_config_helpers/tests/configs/test_roi_pool_layer.py b/python/paddle/trainer_config_helpers/tests/configs/test_roi_pool_layer.py
index 0d6ca9f1bb..b739a81b85 100644
--- a/python/paddle/trainer_config_helpers/tests/configs/test_roi_pool_layer.py
+++ b/python/paddle/trainer_config_helpers/tests/configs/test_roi_pool_layer.py
@@ -4,8 +4,17 @@ data = data_layer(name='data', size=3 * 14 * 14, height=14, width=14)
 
 rois = data_layer(name='rois', size=10)
 
-roi_pool = roi_pool_layer(
+conv = img_conv_layer(
     input=data,
+    filter_size=3,
+    num_channels=3,
+    num_filters=16,
+    padding=1,
+    act=LinearActivation(),
+    bias_attr=True)
+
+roi_pool = roi_pool_layer(
+    input=conv,
     rois=rois,
     pooled_width=7,
     pooled_height=7,
-- 
GitLab