From d4958e8a8e607284f3c7ef189c19d3be8c1ac1ac Mon Sep 17 00:00:00 2001
From: Davis King <davis@dlib.net>
Date: Sat, 8 Oct 2016 14:27:34 -0400
Subject: [PATCH] Evgeniy Fominov's changes that avoid compiler bugs in Visual
 Studio.

---
 examples/dnn_imagenet_ex.cpp       | 14 +++++++++-----
 examples/dnn_imagenet_train_ex.cpp | 30 ++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/examples/dnn_imagenet_ex.cpp b/examples/dnn_imagenet_ex.cpp
index 329c491c6..d1fa82823 100644
--- a/examples/dnn_imagenet_ex.cpp
+++ b/examples/dnn_imagenet_ex.cpp
@@ -47,15 +47,19 @@ using block  = BN<con<N,3,3,1,1,relu<BN<con<N,3,3,stride,stride,SUBNET>>>>>;
 template <int N, typename SUBNET> using ares      = relu<residual<block,N,affine,SUBNET>>;
 template <int N, typename SUBNET> using ares_down = relu<residual_down<block,N,affine,SUBNET>>;
 
+template <typename SUBNET> using level1 = ares<512,ares<512,ares_down<512,SUBNET>>>;
+template <typename SUBNET> using level2 = ares<256,ares<256,ares<256,ares<256,ares<256,ares_down<256,SUBNET>>>>>>;
+template <typename SUBNET> using level3 = ares<128,ares<128,ares<128,ares_down<128,SUBNET>>>>;
+template <typename SUBNET> using level4 = ares<64,ares<64,ares<64,SUBNET>>>;
 
 using anet_type = loss_multiclass_log<fc<1000,avg_pool_everything<
-                            ares<512,ares<512,ares_down<512,
-                            ares<256,ares<256,ares<256,ares<256,ares<256,ares_down<256,
-                            ares<128,ares<128,ares<128,ares_down<128,
-                            ares<64,ares<64,ares<64,
+                            level1<
+                            level2<
+                            level3<
+                            level4<
                             max_pool<3,3,2,2,relu<affine<con<64,7,7,2,2,
                             input_rgb_image_sized<227>
-                            >>>>>>>>>>>>>>>>>>>>>>>;
+                            >>>>>>>>>>>;
 
 // ----------------------------------------------------------------------------------------
 
diff --git a/examples/dnn_imagenet_train_ex.cpp b/examples/dnn_imagenet_train_ex.cpp
index 384e26662..e672018d3 100644
--- a/examples/dnn_imagenet_train_ex.cpp
+++ b/examples/dnn_imagenet_train_ex.cpp
@@ -40,25 +40,35 @@ template <int N, typename SUBNET> using ares_down = relu<residual_down<block,N,a
 
 // ----------------------------------------------------------------------------------------
 
+template <typename SUBNET> using level1 = res<512,res<512,res_down<512,SUBNET>>>;
+template <typename SUBNET> using level2 = res<256,res<256,res<256,res<256,res<256,res_down<256,SUBNET>>>>>>;
+template <typename SUBNET> using level3 = res<128,res<128,res<128,res_down<128,SUBNET>>>>;
+template <typename SUBNET> using level4 = res<64,res<64,res<64,SUBNET>>>;
+
+template <typename SUBNET> using alevel1 = ares<512,ares<512,ares_down<512,SUBNET>>>;
+template <typename SUBNET> using alevel2 = ares<256,ares<256,ares<256,ares<256,ares<256,ares_down<256,SUBNET>>>>>>;
+template <typename SUBNET> using alevel3 = ares<128,ares<128,ares<128,ares_down<128,SUBNET>>>>;
+template <typename SUBNET> using alevel4 = ares<64,ares<64,ares<64,SUBNET>>>;
+
 // training network type
 using net_type = loss_multiclass_log<fc<1000,avg_pool_everything<
-                            res<512,res<512,res_down<512,
-                            res<256,res<256,res<256,res<256,res<256,res_down<256,
-                            res<128,res<128,res<128,res_down<128,
-                            res<64,res<64,res<64,
+                            level1<
+                            level2<
+                            level3<
+                            level4<
                             max_pool<3,3,2,2,relu<bn_con<con<64,7,7,2,2,
                             input_rgb_image_sized<227>
-                            >>>>>>>>>>>>>>>>>>>>>>>;
+                            >>>>>>>>>>>;
 
 // testing network type (replaced batch normalization with fixed affine transforms)
 using anet_type = loss_multiclass_log<fc<1000,avg_pool_everything<
-                            ares<512,ares<512,ares_down<512,
-                            ares<256,ares<256,ares<256,ares<256,ares<256,ares_down<256,
-                            ares<128,ares<128,ares<128,ares_down<128,
-                            ares<64,ares<64,ares<64,
+                            alevel1<
+                            alevel2<
+                            alevel3<
+                            alevel4<
                             max_pool<3,3,2,2,relu<affine<con<64,7,7,2,2,
                             input_rgb_image_sized<227>
-                            >>>>>>>>>>>>>>>>>>>>>>>;
+                            >>>>>>>>>>>;
 
 // ----------------------------------------------------------------------------------------