From 19939657eaf5793af62033c34c071c949c409012 Mon Sep 17 00:00:00 2001
From: tensor-tang <jian.j.tang@intel.com>
Date: Thu, 21 Dec 2017 23:47:34 +0800
Subject: [PATCH] enable training alexnet benchmark

---
 benchmark/paddle/image/alexnet.py            | 22 +++++++++++++++++---
 benchmark/paddle/image/run_mkl_train.sh      |  1 +
 benchmark/paddle/image/run_openblas_train.sh |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/benchmark/paddle/image/alexnet.py b/benchmark/paddle/image/alexnet.py
index 3358d43a4b..10db194485 100644
--- a/benchmark/paddle/image/alexnet.py
+++ b/benchmark/paddle/image/alexnet.py
@@ -6,6 +6,7 @@ height = 227
 width = 227
 num_class = 1000
 batch_size = get_config_arg('batch_size', int, 128)
+use_mkldnn = get_config_arg('use_mkldnn', bool, False)
 
 args = {'height': height, 'width': width, 'color': True, 'num_class': num_class}
 define_py_data_sources2(
@@ -31,7 +32,12 @@ net = img_pool_layer(input=net, pool_size=3, stride=2)
 
 # conv2
 net = img_conv_layer(
-    input=net, filter_size=5, num_filters=256, stride=1, padding=2, groups=1)
+    input=net,
+    filter_size=5,
+    num_filters=256,
+    stride=1,
+    padding=2,
+    groups=2 if use_mkldnn else 1)
 net = img_cmrnorm_layer(input=net, size=5, scale=0.0001, power=0.75)
 net = img_pool_layer(input=net, pool_size=3, stride=2)
 
@@ -40,11 +46,21 @@ net = img_conv_layer(
     input=net, filter_size=3, num_filters=384, stride=1, padding=1)
 # conv4
 net = img_conv_layer(
-    input=net, filter_size=3, num_filters=384, stride=1, padding=1, groups=1)
+    input=net,
+    filter_size=3,
+    num_filters=384,
+    stride=1,
+    padding=1,
+    groups=2 if use_mkldnn else 1)
 
 # conv5
 net = img_conv_layer(
-    input=net, filter_size=3, num_filters=256, stride=1, padding=1, groups=1)
+    input=net,
+    filter_size=3,
+    num_filters=256,
+    stride=1,
+    padding=1,
+    groups=2 if use_mkldnn else 1)
 net = img_pool_layer(input=net, pool_size=3, stride=2)
 
 net = fc_layer(
diff --git a/benchmark/paddle/image/run_mkl_train.sh b/benchmark/paddle/image/run_mkl_train.sh
index 5335af5ac1..c38b3e3621 100755
--- a/benchmark/paddle/image/run_mkl_train.sh
+++ b/benchmark/paddle/image/run_mkl_train.sh
@@ -47,5 +47,6 @@ for use_mkldnn in True False; do
     train vgg 19 $batchsize $use_mkldnn
     train resnet 50 $batchsize $use_mkldnn
     train googlenet v1 $batchsize $use_mkldnn
+    train alexnet group2 $batchsize $use_mkldnn
   done
 done
diff --git a/benchmark/paddle/image/run_openblas_train.sh b/benchmark/paddle/image/run_openblas_train.sh
index b9494ce119..caea5548c3 100755
--- a/benchmark/paddle/image/run_openblas_train.sh
+++ b/benchmark/paddle/image/run_openblas_train.sh
@@ -36,4 +36,5 @@ for batchsize in 64 128 256; do
   train vgg 19 $batchsize
   train resnet 50 $batchsize
   train googlenet v1 $batchsize
+  train alexnet group2 $batchsize $use_mkldnn
 done