Merge remote-tracking branch 'remotes/internal/release_1.1.1a'

Author: daisyden

external/mlsl/prepare_mlsl.sh

@@ -59,7 +59,7 @@ fi
 
 # Clean up the previous MLSL version
 # Can be used for l_mlsl_2017.1.016, l_mlsl_2017.2.018
-function CleanUpPreviousMLSL()
+CleanUpPreviousMLSL()
 {
 version_year=$1
 version_num=$2

scripts/benchmark_config_default.json

@@ -1,44 +1,44 @@
 {
     "params":{
-        "topology" : "resnet_50",
+        "topology" : "all",
         "hostfile" : "",
         "network" : "",
         "netmask" : "",
         "dummy_data_use" : true,
         "scal_test" : false,
         "caffe_bin" : "",
-        "engine" : ""
+        "engine" : "MKLDNN"
     },
     "perf_batch_size_table" : {
-        "alexnet" : {
-            "bdw" : "1024",
-            "skx" : "1024",
-            "knl" : "512",
-            "knm" : "1024"
-        },
-        "googlenet" : {
-            "bdw" : "128",
-            "skx" : "144",
-            "knl" : "144",
-            "knm" : "144"
-        },
-        "googlenet_v2" : {
-            "bdw" : "128",
-            "skx" : "192",
-            "knl" : "192",
-            "knm" : "128"
-        },
-        "resnet_50" : {
-            "bdw" : "32",
-            "skx" : "96",
-            "knl" : "64",
-            "knm" : "64"
-        }
+    "resnet_50": {
+			"knl": "512",
+			"bdw": "512",
+			"knm": "512",
+			"skx": "512"
+		},
+		"googlenet_v2": {
+			"knl": "192",
+			"bdw": "192",
+			"knm": "192",
+			"skx": "192"
+		},
+		"alexnet": {
+			"knl": "512",
+			"bdw": "512",
+			"knm": "1024",
+			"skx": "1024"
+		},
+		"googlenet": {
+			"knl": "144",
+			"bdw": "96",
+			"knm": "144",
+			"skx": "144"
+		}
     },
     "scal_batch_size_table" : {
         "alexnet" : "256",
         "googlenet" : "64",
         "googlenet_v2" : "64",
-        "resnet_50" : "64"
+        "resnet_50" : "128"
     }
 }