Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix_lr_decay

Author: JiayiFeng

CMakeLists.txt

@@ -136,6 +136,12 @@ else()
     set(THIRD_PARTY_BUILD_TYPE Release)
 endif()
 
+if(WITH_MKL)
+  option(MKL_SPLIT_GEMM "PaddlePaddle MKL gemm would split to small ones" OFF)
+  if (MKL_SPLIT_GEMM)
+    add_definitions(-DPADDLE_MKL_SPLIT_GEMM)
+  endif()
+endif()
 set(WITH_MKLML ${WITH_MKL})
 if (NOT DEFINED WITH_MKLDNN)
     if (WITH_MKL AND AVX2_FOUND)

benchmark/paddle/image/run.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function train() {

benchmark/paddle/image/run_mkl_infer.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function clock_to_seconds() {

benchmark/paddle/image/run_mkl_train.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function train() {

benchmark/paddle/image/run_openblas_infer.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function clock_to_seconds() {

benchmark/paddle/image/run_openblas_train.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function train() {

benchmark/paddle/rnn/run.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function train() {

benchmark/tensorflow/image/run.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function test() {

benchmark/tensorflow/image/run_multi.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function test() {

benchmark/tensorflow/rnn/run.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 function test() {