From 84c17725d7fdce950b2327544425dd7733fc1e77 Mon Sep 17 00:00:00 2001
From: yajiedesign <yajiedesign@gmail.com>
Date: Tue, 15 Dec 2015 11:11:44 +0800
Subject: [PATCH 1/4] fix compile error with visual studio

---
 include/mxnet/optimizer.h | 6 ++++++
 src/optimizer/sgd-inl.h   | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/mxnet/optimizer.h b/include/mxnet/optimizer.h
index fb15f2c04ec5..5b438078519c 100644
--- a/include/mxnet/optimizer.h
+++ b/include/mxnet/optimizer.h
@@ -17,9 +17,15 @@
 #include "./base.h"
 #include "./resource.h"
 
+#if DMLC_USE_CXX11
+#include <mxnet/ndarray.h>
+#endif
+
 namespace mxnet {
 
+#if !DMLC_USE_CXX11
 class NDArray;
+#endif
 
 class Optimizer {
  public:
diff --git a/src/optimizer/sgd-inl.h b/src/optimizer/sgd-inl.h
index 8edbe337a3ae..ce1785102221 100644
--- a/src/optimizer/sgd-inl.h
+++ b/src/optimizer/sgd-inl.h
@@ -101,7 +101,6 @@ void call_sgd_update_gpu(RunContext ctx, TBlob weight, const TBlob grad,
 #endif  // MXNET_USE_CUDA
 
 #if DMLC_USE_CXX11
-#include <mxnet/ndarray.h>
 
 class SGDOpt : public Optimizer {
  public:

From d8fcdf73665abc1e0012467b9a2562c2cb36fdd3 Mon Sep 17 00:00:00 2001
From: Junru Shao <yz_sjr@sjtu.edu.cn>
Date: Wed, 16 Dec 2015 08:01:00 +0800
Subject: [PATCH 2/4] Update build.md

Add introduction for building with Intel MKL
---
 doc/build.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/build.md b/doc/build.md
index 95be4372ea65..8df3d9d648bf 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -126,6 +126,9 @@ various distributed filesystem such as HDFS/Amazon S3/...
 - First copy [make/config.mk](../make/config.mk) to the project root, on which
   any local modification will be ignored by git, then modify the according flags.
 
+#### Building with Intel MKL Support
+First, `source /path/to/intel/bin/compilervars.sh` to automatically set environment variables. Then, edit [make/config.mk](../make/config.mk), let `USE_BLAS = mkl`. `USE_INTEL_PATH = NONE` is usually not necessary to be modified.
+
 
 ## Python Package Installation
 

From 721cb54168035c91223c92ad131aa9feda4f1422 Mon Sep 17 00:00:00 2001
From: Tianqi Chen <tqchen@users.noreply.github.com>
Date: Wed, 16 Dec 2015 09:49:13 +0800
Subject: [PATCH 3/4] Update CONTRIBUTORS.md

---
 CONTRIBUTORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 38d06e5e7e07..31f1356cc0a4 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -89,3 +89,4 @@ List of Contributors
 * [Ye Zhou](https://github.com/zhouye)
 * [Zhang Chen](https://github.com/zhangchen-qinyinghua)
 * [Xianliang Wang](https://github.com/wangxianliang)
+* [Junru Shao](https://github.com/yzgysjr)

From 5b7790e52d12162398493545cce31f68d9633efb Mon Sep 17 00:00:00 2001
From: terrytangyuan <terrytangyuan@gmail.com>
Date: Wed, 16 Dec 2015 19:12:48 -0600
Subject: [PATCH 4/4] Add integration test for linux

---
 .travis.yml              | 2 --
 tests/travis/run_test.sh | 9 +++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e117530b4154..23377bf0f562 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,6 @@ matrix:
       env: TASK=doc
     - os: linux
       env: TASK=r_test
-    - os: linux
-      env: TASK=scala_test
 
 # dependent apt packages
 addons:
diff --git a/tests/travis/run_test.sh b/tests/travis/run_test.sh
index 229dda73a54a..18a55a081b8f 100755
--- a/tests/travis/run_test.sh
+++ b/tests/travis/run_test.sh
@@ -119,12 +119,17 @@ if [ ${TASK} == "scala_test" ]; then
     mkdir -p ${CACHE_PREFIX}/data
     ln -s ${CACHE_PREFIX}/data ${PWD}/data
 
+    cd scala-package
+    export JAVA_HOME=$(/usr/libexec/java_home)
+
     if [ ${TRAVIS_OS_NAME} == "osx" ]; then
-        cd scala-package
-        export JAVA_HOME=$(/usr/libexec/java_home)
         mvn clean package -P osx-x86_64
         mvn integration-test -P osx-x86_64
     fi
+    if [ ${TRAVIS_OS_NAME} == "linux" ]; then
+        mvn clean package -P linux-x86_64
+        mvn integration-test -P linux-x86_64
+    fi
 
     exit 0
 fi