Added MVN layer. Renamed layer test data.

opencv · Aug 12, 2015 · df5eec6 · df5eec6
1 parent f8119ea
commit df5eec6
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 9 deletions.
diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp
@@ -54,42 +54,47 @@ static void testLayer(String basename, bool useCaffeModel = false)
 
 TEST(Layer_Test_Softmax, Accuracy)
 {
-     testLayer("softmax");
+     testLayer("layer_softmax");
 }
 
 TEST(Layer_Test_LRN_spatial, Accuracy)
 {
-     testLayer("lrn_spatial");
+     testLayer("layer_lrn_spatial");
 }
 
 TEST(Layer_Test_LRN_channels, Accuracy)
 {
-     testLayer("lrn_channels");
+     testLayer("layer_lrn_channels");
 }
 
 TEST(Layer_Test_Convolution, Accuracy)
 {
-     testLayer("convolution", true);
+     testLayer("layer_convolution", true);
 }
 
 TEST(Layer_Test_InnerProduct, Accuracy)
 {
-     testLayer("inner_product", true);
+     testLayer("layer_inner_product", true);
 }
 
 TEST(Layer_Test_Pooling_max, Accuracy)
 {
-     testLayer("pooling_max");
+     testLayer("layer_pooling_max");
 }
 
 TEST(Layer_Test_Pooling_ave, Accuracy)
 {
-     testLayer("pooling_ave");
+     testLayer("layer_pooling_ave");
 }
 
 TEST(Layer_Test_DeConvolution, Accuracy)
 {
-     testLayer("deconvolution", true);
+     testLayer("layer_deconvolution", true);
+}
+
+TEST(Layer_Test_MVN, Accuracy)
+{
+     testLayer("layer_mvn");
 }
 
 TEST(Layer_Test_Reshape, squeeze)

diff --git a/.../testdata/dnn/layers/convolution.prototxt → ...ata/dnn/layers/layer_convolution.prototxt b/.../testdata/dnn/layers/convolution.prototxt → ...ata/dnn/layers/layer_convolution.prototxt
diff --git a/...estdata/dnn/layers/deconvolution.prototxt → ...a/dnn/layers/layer_deconvolution.prototxt b/...estdata/dnn/layers/deconvolution.prototxt → ...a/dnn/layers/layer_deconvolution.prototxt
diff --git a/...estdata/dnn/layers/inner_product.prototxt → ...a/dnn/layers/layer_inner_product.prototxt b/...estdata/dnn/layers/inner_product.prototxt → ...a/dnn/layers/layer_inner_product.prototxt
diff --git a/...testdata/dnn/layers/lrn_channels.prototxt → ...ta/dnn/layers/layer_lrn_channels.prototxt b/...testdata/dnn/layers/lrn_channels.prototxt → ...ta/dnn/layers/layer_lrn_channels.prototxt
diff --git a/.../testdata/dnn/layers/lrn_spatial.prototxt → ...ata/dnn/layers/layer_lrn_spatial.prototxt b/.../testdata/dnn/layers/lrn_spatial.prototxt → ...ata/dnn/layers/layer_lrn_spatial.prototxt
diff --git a/modules/dnn/testdata/dnn/layers/layer_mvn.prototxt b/modules/dnn/testdata/dnn/layers/layer_mvn.prototxt
@@ -0,0 +1,21 @@
+name: "test_MVN_channels"
+input: "input"
+
+input_dim: 2
+input_dim: 6
+input_dim: 75
+input_dim: 113
+
+layer {
+  type: "MVN"
+
+  mvn_param {
+  	eps: 0.1
+    across_channels: false
+    normalize_variance: true
+  }
+
+  name: "output"
+  bottom: "input"
+  top: "output"
+}
diff --git a/.../testdata/dnn/layers/pooling_ave.prototxt → ...ata/dnn/layers/layer_pooling_ave.prototxt b/.../testdata/dnn/layers/pooling_ave.prototxt → ...ata/dnn/layers/layer_pooling_ave.prototxt
diff --git a/.../testdata/dnn/layers/pooling_max.prototxt → ...ata/dnn/layers/layer_pooling_max.prototxt b/.../testdata/dnn/layers/pooling_max.prototxt → ...ata/dnn/layers/layer_pooling_max.prototxt
diff --git a/.../dnn/testdata/dnn/layers/softmax.prototxt → ...estdata/dnn/layers/layer_softmax.prototxt b/.../dnn/testdata/dnn/layers/softmax.prototxt → ...estdata/dnn/layers/layer_softmax.prototxt
diff --git a/modules/dnn/testdata/dnn/layers/lrn_channels.prototxt.caffe.npy b/modules/dnn/testdata/dnn/layers/lrn_channels.prototxt.caffe.npy
diff --git a/modules/dnn/testdata/dnn/layers/lrn_spatial.prototxt.caffe.npy b/modules/dnn/testdata/dnn/layers/lrn_spatial.prototxt.caffe.npy
diff --git a/modules/dnn/testdata/dnn/layers/run.py b/modules/dnn/testdata/dnn/layers/run.py
@@ -30,7 +30,7 @@ def get_cafe_output(inp_blob, proto_name, caffemodel_name):
     return out_blob
 
 if __name__ == '__main__':
-    proto_filenames = glob.glob("*.prototxt")
+    proto_filenames = glob.glob("layer_*.prototxt")
 
     inp_blob = np.load('blob.npy')
     print inp_blob.shape

diff --git a/modules/dnn/testdata/dnn/layers/softmax.prototxt.caffe.npy b/modules/dnn/testdata/dnn/layers/softmax.prototxt.caffe.npy