From 2ab6907fe287df32bfd5602f15aef832e2d02986 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 18:45:42 -0700
Subject: [PATCH 01/26] add os lrt

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index a24bea327..aa9bf632f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,12 @@ ifeq ($(OS), Windows_NT)
 	export CC = gcc -m64
 endif
 
+UNAME= $(shell uname)
+
+ifeq ($(UNAME), Linux)
+	LDFLAGS += -lrt
+endif
+
 ifeq ($(no_omp),1)
 	CFLAGS += -DDISABLE_OPENMP
 else

From 24a188588a6d3dae7a8d7be803cc57336f14bebb Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 20:10:29 -0700
Subject: [PATCH 02/26] ok

---
 scripts/travis_osx_install.sh | 9 +++++----
 scripts/travis_script.sh      | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/travis_osx_install.sh b/scripts/travis_osx_install.sh
index d82dfe63d..4b4c714b8 100755
--- a/scripts/travis_osx_install.sh
+++ b/scripts/travis_osx_install.sh
@@ -5,7 +5,8 @@ if [ ${TRAVIS_OS_NAME} != "osx" ]; then
 fi
 
 brew update
-brew install unzip
-brew install python-numpy
-brew install python-scipy
-brew install python-nose
+
+if [ ${TASK} == "python-package" ]; then
+    brew install python git
+    easy_install pip scipy numpy
+fi
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 3717c2ed2..85bfab47f 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -18,7 +18,11 @@ fi
 if [ ${TASK} == "build-with-dmlc" ]; then
     cd dmlc-core
     cp make/config.mk .
-    echo "USE_S3=1" >> config.mk
+    if [ ${TRAVIS_OS_NAME} != "osx" ]; then
+        echo "USE_S3=1" >> config.mk
+    else
+        echo "USE_S3=0" >> config.mk
+    fi
     make all CXX=${CXX}|| exit -1
     cd ..
     make dmlc=dmlc-core CXX=${CXX} || exit -1

From 6062f4dd587ebcc413e5d838702c74cdd39792a1 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 20:18:54 -0700
Subject: [PATCH 03/26] update

---
 scripts/travis_osx_install.sh | 3 ++-
 scripts/travis_script.sh      | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/travis_osx_install.sh b/scripts/travis_osx_install.sh
index 4b4c714b8..95e5838a8 100755
--- a/scripts/travis_osx_install.sh
+++ b/scripts/travis_osx_install.sh
@@ -8,5 +8,6 @@ brew update
 
 if [ ${TASK} == "python-package" ]; then
     brew install python git
-    easy_install pip scipy numpy
+    easy_install pip
+    pip install numpy scipy
 fi
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 85bfab47f..0d4cf8049 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -7,7 +7,7 @@ if [ ${TASK} == "lint" ]; then
     fi
 fi
 
-if [ ${TRAVIS_OS_NAME} != "osx" ]; then
+if [ ${TRAVIS_OS_NAME} == "osx" ]; then
     export no_omp=1
 fi
 
@@ -37,7 +37,10 @@ if [ ${TASK} == "python-package" ]; then
     nosetests tests/python || exit -1
 fi
 
+# only test java under linux for now
 if [ ${TASK} == "java-package" ]; then
-    make java CXX=${CXX} || exit -1
-    scripts/travis_java_script.sh || exit -1
+    if [ ${TRAVIS_OS_NAME} != "osx" ]; then
+        make java CXX=${CXX} || exit -1
+        scripts/travis_java_script.sh || exit -1
+    fi
 fi

From d9599f816fab5cd777a8f5ab8bfafc98a5736316 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:01:53 -0700
Subject: [PATCH 04/26] add appvegor

---
 appvegor.yml                  | 22 ++++++++++++++++++++++
 scripts/travis_osx_install.sh |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 appvegor.yml

diff --git a/appvegor.yml b/appvegor.yml
new file mode 100644
index 000000000..7adff2a2d
--- /dev/null
+++ b/appvegor.yml
@@ -0,0 +1,22 @@
+platform:
+  - x64
+  - x86
+
+configuration:
+  - Release
+
+clone_folder: c:\dmlc\xgboost
+
+
+install:
+  - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
+  - ps: if (-not(Test-Path($env:PYTHON))) { & python-appvegor-demo\appveyor\install.ps1 }
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - "python --version"
+  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "pip instal nose numpy scipy"
+
+build:
+  parallel: true
+  project: windows\xgboost.sln
+
diff --git a/scripts/travis_osx_install.sh b/scripts/travis_osx_install.sh
index 95e5838a8..8121afd6b 100755
--- a/scripts/travis_osx_install.sh
+++ b/scripts/travis_osx_install.sh
@@ -9,5 +9,5 @@ brew update
 if [ ${TASK} == "python-package" ]; then
     brew install python git
     easy_install pip
-    pip install numpy scipy
+    pip install numpy scipy nose
 fi

From 15286523cf98b6d4fe28d9c4a5bbb8f3b6ae41aa Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:06:29 -0700
Subject: [PATCH 05/26] ok

---
 appvegor.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/appvegor.yml b/appvegor.yml
index 7adff2a2d..bb9bfe8c9 100644
--- a/appvegor.yml
+++ b/appvegor.yml
@@ -5,9 +5,6 @@ platform:
 configuration:
   - Release
 
-clone_folder: c:\dmlc\xgboost
-
-
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
   - ps: if (-not(Test-Path($env:PYTHON))) { & python-appvegor-demo\appveyor\install.ps1 }
@@ -17,6 +14,6 @@ install:
   - "pip instal nose numpy scipy"
 
 build:
-  parallel: true
-  project: windows\xgboost.sln
+  - "msbuild windows\xgboost.sln"
+
 

From 8f6e5e197b6be3bdcc0d32520616a1e3b142206e Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:07:18 -0700
Subject: [PATCH 06/26] ok

---
 appvegor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appvegor.yml b/appvegor.yml
index bb9bfe8c9..2d7f233fe 100644
--- a/appvegor.yml
+++ b/appvegor.yml
@@ -12,8 +12,8 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   - "pip instal nose numpy scipy"
-
-build:
   - "msbuild windows\xgboost.sln"
 
+build: false
+
 

From fa41fe3f13b03d041f6f01ade3d51ce5a5eaf8e7 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:09:42 -0700
Subject: [PATCH 07/26] rename

---
 appvegor.yml => appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename appvegor.yml => appveyor.yml (89%)

diff --git a/appvegor.yml b/appveyor.yml
similarity index 89%
rename from appvegor.yml
rename to appveyor.yml
index 2d7f233fe..ead70d5ef 100644
--- a/appvegor.yml
+++ b/appveyor.yml
@@ -12,8 +12,8 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   - "pip instal nose numpy scipy"
-  - "msbuild windows\xgboost.sln"
 
-build: false
+build:
+  project: windows\xgboost.sln
 
 

From c870c08b7ebd46f189e6d94cc98b51817ba2703f Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:11:44 -0700
Subject: [PATCH 08/26] disable openmp in dmlc

---
 scripts/travis_script.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 0d4cf8049..402cb6992 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -9,6 +9,7 @@ fi
 
 if [ ${TRAVIS_OS_NAME} == "osx" ]; then
     export no_omp=1
+    export NO_OPENMP=1
 fi
 
 if [ ${TASK} == "build" ]; then

From 2bf0eeb82dbe60512151feef6f33e24a6f7fc344 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:15:25 -0700
Subject: [PATCH 09/26] update appvegor

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index ead70d5ef..96018b1d0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ configuration:
 
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
-  - ps: if (-not(Test-Path($env:PYTHON))) { & python-appvegor-demo\appveyor\install.ps1 }
+  - ps:  python-appvegor-demo\appveyor\install.ps1
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""

From 899bfbfbaed6c05225c9fae530426daead64e3d1 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:19:49 -0700
Subject: [PATCH 10/26] rest

---
 appveyor.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 96018b1d0..fbad6f51a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,8 @@ configuration:
 
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
-  - ps:  python-appvegor-demo\appveyor\install.ps1
+  - cmd: copy-item python-appvegor-demo\appvegor\install.ps1 install.ps1
+  - ps: .\\install.ps1
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
@@ -15,5 +16,3 @@ install:
 
 build:
   project: windows\xgboost.sln
-
-

From 0d5741bc7469ebba3e480716619a6c1d2279d528 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:21:15 -0700
Subject: [PATCH 11/26] rest

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index fbad6f51a..a7f7e2de0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ configuration:
 
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
-  - cmd: copy-item python-appvegor-demo\appvegor\install.ps1 install.ps1
+  - cmd: copy python-appvegor-demo\appvegor\install.ps1 install.ps1
   - ps: .\\install.ps1
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"

From 033a0c139e80fbbbd6863169c0a83cf315b8f3ef Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:21:58 -0700
Subject: [PATCH 12/26] ok

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index a7f7e2de0..b6feac2a5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ configuration:
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
   - cmd: copy python-appvegor-demo\appvegor\install.ps1 install.ps1
-  - ps: .\\install.ps1
+  - ps: install.ps1
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""

From bb13c2cd1587d5fcf9b1f0e99b488f291b6394bd Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:25:52 -0700
Subject: [PATCH 13/26] ok

---
 appveyor.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b6feac2a5..5c7dd813f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,8 +7,9 @@ configuration:
 
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
-  - cmd: copy python-appvegor-demo\appvegor\install.ps1 install.ps1
-  - ps: install.ps1
+  - cmd: mkdir appveyor
+  - cmd: copy python-appveyor-demo\appvegor\install.ps1 appveyor\install.ps1
+  - ps: appvegor\install.ps1
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""

From 1a91b15a6ea9cbbaaf749f3f3b3dfbbff3e48a07 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:27:40 -0700
Subject: [PATCH 14/26] ok

---
 appveyor.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5c7dd813f..230991777 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,9 +7,7 @@ configuration:
 
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
-  - cmd: mkdir appveyor
-  - cmd: copy python-appveyor-demo\appvegor\install.ps1 appveyor\install.ps1
-  - ps: appvegor\install.ps1
+  - ps: python-appveyor-demo\appveyor\install.ps1
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""

From c2c5ad2d47fccaf76e0ea8d6dd0d903ad7c9763d Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:35:15 -0700
Subject: [PATCH 15/26] finl

---
 appveyor.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 230991777..0211f15c4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,7 @@
+environment:
+  global:
+   CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\python-appveyor-demo\\appveyor\\run_with_env.cmd"
+
 platform:
   - x64
   - x86
@@ -7,11 +11,17 @@ configuration:
 
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
-  - ps: python-appveyor-demo\appveyor\install.ps1
+  - ECHO "Filesystem root:"
+  - ps: "ls \"C:/\""
+
+  - ECHO "Installed SDKs:"
+  - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
+
+  - ps: if (-not(Test-Path($env:PYTHON))) { & python-appveyor-demo\appveyor\install.ps1 }
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  - "pip instal nose numpy scipy"
+  - ""%CMD_IN_ENV% pip install numpy scipy nose"
 
 build:
   project: windows\xgboost.sln

From 7e166066185773e66a9afc3145e4116937af4da1 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:36:28 -0700
Subject: [PATCH 16/26] ok

---
 appveyor.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0211f15c4..388acccf3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,7 +21,10 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  - ""%CMD_IN_ENV% pip install numpy scipy nose"
+  - "%CMD_IN_ENV% pip install numpy scipy nose"
 
 build:
   project: windows\xgboost.sln
+
+test_script:
+  - "%CMD_IN_ENV% nosetests test\\python"
\ No newline at end of file

From 6f4148faab6f9034ab6bb5f622dd7513facfb789 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:37:16 -0700
Subject: [PATCH 17/26] ok

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 388acccf3..0d0a2b72f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,7 +17,7 @@ install:
   - ECHO "Installed SDKs:"
   - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
 
-  - ps: if (-not(Test-Path($env:PYTHON))) { & python-appveyor-demo\appveyor\install.ps1 }
+  - ps: python-appveyor-demo\appveyor\install.ps1
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""

From e30c724bd4b5f156bbe80903415937fd46e9a48d Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:39:34 -0700
Subject: [PATCH 18/26] ok

---
 appveyor.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0d0a2b72f..401a150c3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,9 +2,17 @@ environment:
   global:
    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\python-appveyor-demo\\appveyor\\run_with_env.cmd"
 
+  matrix:
+    - PYTHON: "C:\\Python27-x64"
+      PYTHON_VERSION: "2.7.x" # currently 2.7.9
+      PYTHON_ARCH: "64"
+
+    - PYTHON: "C:\\Python33-x64"
+      PYTHON_VERSION: "3.3.x" # currently 3.3.5
+      PYTHON_ARCH: "64"
+
 platform:
   - x64
-  - x86
 
 configuration:
   - Release

From 259dea0777f3d7e9cacdca76660fcc9cccf02f02 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 21:46:41 -0700
Subject: [PATCH 19/26] incomplete appveyor

---
 appveyor.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 401a150c3..67c310a00 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,10 +29,7 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  - "%CMD_IN_ENV% pip install numpy scipy nose"
 
 build:
   project: windows\xgboost.sln
 
-test_script:
-  - "%CMD_IN_ENV% nosetests test\\python"
\ No newline at end of file

From 5dab410537e098f212863d4e8824dd7ec261dcde Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 22:00:38 -0700
Subject: [PATCH 20/26] ok

---
 appveyor.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 67c310a00..c9948ba5f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,5 +31,4 @@ install:
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
 build:
-  project: windows\xgboost.sln
-
+  - cmd: msbuild windows\xgboost.sln /openmp-

From 67d332e0f55c9618e05fa5eb6cc2eb1977751200 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 22:01:42 -0700
Subject: [PATCH 21/26] ok

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c9948ba5f..6a64fb15f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,6 +29,6 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-
-build:
   - cmd: msbuild windows\xgboost.sln /openmp-
+
+build: off

From 6f01fa50ce6f5e0ff177ea5b59e4e4ae7f6eac2a Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 22:14:38 -0700
Subject: [PATCH 22/26] try disable omp

---
 appveyor.yml    | 1 +
 src/utils/omp.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6a64fb15f..3f5011824 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,7 @@
 environment:
   global:
    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\python-appveyor-demo\\appveyor\\run_with_env.cmd"
+   DISABLE_OPENMP: 1
 
   matrix:
     - PYTHON: "C:\\Python27-x64"
diff --git a/src/utils/omp.h b/src/utils/omp.h
index ddd3467d9..e3c61110c 100644
--- a/src/utils/omp.h
+++ b/src/utils/omp.h
@@ -7,10 +7,10 @@
 #ifndef XGBOOST_UTILS_OMP_H_
 #define XGBOOST_UTILS_OMP_H_
 
-#if defined(_OPENMP)
+#if defined(_OPENMP) && !defined(DISABLE_OPENMP)
 #include <omp.h>
 #else
-#ifndef DISABLE_OPENMP
+#if !defined(DISABLE_OPENMP)
 // use pragma message instead of warning
 #pragma message("Warning: OpenMP is not available,"\
                 "xgboost will be compiled into single-thread code."\

From 0a9c8acd6db158a10616de64799af1343d80c0bc Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 22:17:25 -0700
Subject: [PATCH 23/26] final

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3f5011824..30c009c2a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,6 +30,6 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  - cmd: msbuild windows\xgboost.sln /openmp-
 
-build: off
+build:
+  project: windows\xgboost.sln

From 73ec467dd3911319edb36714589e8ac27a2417e2 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 22:22:43 -0700
Subject: [PATCH 24/26] final

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 30c009c2a..ab1040434 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,6 +30,6 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - cmd: msbuild windows\xgboost.sln /DDISABLE_OPENMP=1  /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
-build:
-  project: windows\xgboost.sln
+build: off
\ No newline at end of file

From ebefb78fd418b4fc542c4652207d692728388b1f Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 22:26:21 -0700
Subject: [PATCH 25/26] use debug

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ab1040434..dfc291922 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,7 @@ platform:
   - x64
 
 configuration:
-  - Release
+  - Debug
 
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo
@@ -30,6 +30,6 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  - cmd: msbuild windows\xgboost.sln /DDISABLE_OPENMP=1  /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
-build: off
\ No newline at end of file
+build:
+  project: windows\xgboost.sln
\ No newline at end of file

From 4a6f4eaac95474da59a3b6107b327bec456c18d5 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Wed, 29 Jul 2015 22:31:35 -0700
Subject: [PATCH 26/26] giveup for now, appveyor do not support openmp for msvc
 yet allow openmp to switch on

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index dfc291922..1fb594cb2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,7 @@ platform:
   - x64
 
 configuration:
-  - Debug
+  - Release
 
 install:
   - cmd: git clone https://github.com/ogrisel/python-appveyor-demo