From b7e127f21287d6e5421eb123838cd97570e94cef Mon Sep 17 00:00:00 2001
From: Davis King <davis@dlib.net>
Date: Sat, 12 Dec 2015 12:59:29 -0500
Subject: [PATCH] Fixed old tests.  Also added more max pooling tests.

---
 dlib/test/dnn.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/dlib/test/dnn.cpp b/dlib/test/dnn.cpp
index df8d436e4..1ce52eeac 100644
--- a/dlib/test/dnn.cpp
+++ b/dlib/test/dnn.cpp
@@ -340,7 +340,7 @@ namespace
         DLIB_TEST(max(abs(truth3-mat(dest))) < 1e-5);
 
         matrix<float> truth4 = pointwise_multiply(mat(A), mat(B));
-        multiply(A, B);
+        multiply(A, A, B);
         DLIB_TEST(max(abs(truth4-mat(A))) < 1e-5);
 
         matrix<float> truth5 = mat(B) > 0.1;
@@ -497,8 +497,8 @@ namespace
         rnd.fill_uniform(dest);
         rnd.fill_uniform(src);
         dest2 = dest; src2 = src;
-        cuda::multiply(dest, src);
-        cpu::multiply(dest2, src2);
+        cuda::multiply(dest, dest, src);
+        cpu::multiply(dest2, dest2, src2);
         DLIB_TEST(equal(mat(dest),mat(dest2)));
 
 
@@ -692,6 +692,56 @@ namespace
     }
 #endif
 
+// ----------------------------------------------------------------------------------------
+
+    void test_max_pool(
+        const int window_height,
+        const int window_width,
+        const int stride_y,
+        const int stride_x 
+    )
+    {
+        print_spinner();
+        resizable_tensor A, B, gradient_input;
+        A.set_size(2,2,16,7);
+        B.copy_size(A);
+        gradient_input.copy_size(A);
+
+        tt::tensor_rand rnd;
+        rnd.fill_gaussian(A,0,1);
+        rnd.fill_gaussian(B,0,1);
+        rnd.fill_gaussian(gradient_input,0,1);
+
+
+        tt::max_pool mp;
+
+        mp.setup(window_height,window_width,stride_y,stride_x);
+        mp(A, B);
+
+        // make sure max_pool does what it's spec says it should.
+        DLIB_TEST( A.num_samples() == B.num_samples());
+        DLIB_TEST( A.k() == B.k());
+        DLIB_TEST( A.nr() == B.nr()/stride_y);
+        DLIB_TEST( A.nc() == B.nc()/stride_x);
+        for (long s = 0; s < A.num_samples(); ++s)
+        {
+            for (long k = 0; k < A.k(); ++k)
+            {
+                for (long r = 0; r < A.nr(); ++r)
+                {
+                    for (long c = 0; c < A.nc(); ++c)
+                    {
+                        DLIB_TEST(image_plane(A,s,k)(r,c) == max(subm_clipped(image_plane(B,s,k),
+                                    r*stride_y,
+                                    c*stride_x,
+                                    window_height,
+                                    window_width)));
+                    }
+                }
+            }
+        }
+    }
+
 // ----------------------------------------------------------------------------------------
 
     void test_layers()
@@ -785,6 +835,10 @@ namespace
             compare_bn_gpu_and_cpu();
             compare_bn_conv_gpu_and_cpu();
 #endif
+            test_max_pool(1,1,2,3);
+            test_max_pool(3,3,1,1);
+            test_max_pool(3,3,2,2);
+            test_max_pool(4,5,3,1);
             test_tanh();
             test_softmax();
             test_sigmoid();