Merge remote-tracking branch 'apache/master' into gemm_trsm_batching

CODEOWNERS

@@ -4,11 +4,16 @@
 *			@apache/mxnet-committers
 
 # Owners of language bindings
-R-package/*		@thirdwing
-scala-package/*		@javelinjs
-perl-package/*		@sergeykolychev
+/R-package/		@thirdwing
+/scala-package/		@yzhliu
+/perl-package/		@sergeykolychev
 
 # CMake owners
 CMakeLists.txt		@cjolivier01
-cmake/*			@cjolivier01
+/cmake/			@cjolivier01
 
+# Owners of MXNet CI
+/tests/ci_build/    @marcoabreu
+Jenkinsfile         @marcoabreu
+.travis.yml         @marcoabreu
+appveyor.yml        @marcoabreu

CONTRIBUTORS.md

@@ -33,7 +33,7 @@ The committers are the granted write access to the project.
   - KK is a R ninja, he makes mxnet available for R users.
 * [Tong He](https://github.com/hetong007)
   - Tong is the major maintainer of MXNetR, he designs the mxnet interface and wrote many of the tutorials on R.
-* [Yizhi Liu](https://github.com/javelinjs)
+* [Yizhi Liu](https://github.com/yzhliu)
   - Yizhi is the main creator on mxnet scala project to make deep learning available for JVM stacks.
 * [Zixuan Huang](https://github.com/yanqingmen)
   - Zixuan is one of major maintainers of mxnet scala package.
@@ -86,7 +86,7 @@ List of Contributors
 * [Mathis](https://github.com/sveitser)
 * [sennendoko](https://github.com/sennendoko)
 * [srand99](https://github.com/srand99)
-* [Yizhi Liu](https://github.com/javelinjs)
+* [Yizhi Liu](https://github.com/yzhliu)
 * [Taiyun](https://github.com/taiyun)
 * [Yanghao Li](https://github.com/lyttonhao)
 * [Nan Zhu](https://github.com/CodingCat)

Jenkinsfile

@@ -16,7 +16,7 @@ def init_git() {
   deleteDir()
   retry(5) {
     try {
-      // Make sure wait long enough for quote. Important: Don't increase the amount of 
+      // Make sure wait long enough for api.github.com request quota. Important: Don't increase the amount of 
       // retries as this will increase the amount of requests and worsen the throttling
       timeout(time: 15, unit: 'MINUTES') {
         checkout scm
@@ -35,7 +35,9 @@ def init_git_win() {
   deleteDir()
   retry(5) {
     try {
-      timeout(time: 2, unit: 'MINUTES') {
+      // Make sure wait long enough for api.github.com request quota. Important: Don't increase the amount of
+      // retries as this will increase the amount of requests and worsen the throttling
+      timeout(time: 15, unit: 'MINUTES') {
         checkout scm
         bat 'git submodule update --init'
         bat 'git clean -d -f'        
@@ -245,62 +247,66 @@ try {
     },
     'Build CPU windows':{
       node('mxnetwindows-cpu') {
-        ws('workspace/build-cpu') {
-          withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas', 'OpenCV_DIR=C:\\mxnet\\opencv_vc14', 'CUDA_PATH=C:\\CUDA\\v8.0']) {
-            init_git_win()
-            bat """mkdir build_vc14_cpu
-              call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
-              cd build_vc14_cpu
-              cmake -G \"Visual Studio 14 2015 Win64\" -DUSE_CUDA=0 -DUSE_CUDNN=0 -DUSE_NVRTC=0 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 ${env.WORKSPACE}"""
-            bat 'C:\\mxnet\\build_vc14_cpu.bat'
+        timeout(time: max_time, unit: 'MINUTES') {
+          ws('workspace/build-cpu') {
+            withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas', 'OpenCV_DIR=C:\\mxnet\\opencv_vc14', 'CUDA_PATH=C:\\CUDA\\v8.0']) {
+              init_git_win()
+              bat """mkdir build_vc14_cpu
+                call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
+                cd build_vc14_cpu
+                cmake -G \"Visual Studio 14 2015 Win64\" -DUSE_CUDA=0 -DUSE_CUDNN=0 -DUSE_NVRTC=0 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 ${env.WORKSPACE}"""
+              bat 'C:\\mxnet\\build_vc14_cpu.bat'
 
-            bat '''rmdir /s/q pkg_vc14_cpu
-              mkdir pkg_vc14_cpu\\lib
-              mkdir pkg_vc14_cpu\\python
-              mkdir pkg_vc14_cpu\\include
-              mkdir pkg_vc14_cpu\\build
-              copy build_vc14_cpu\\Release\\libmxnet.lib pkg_vc14_cpu\\lib
-              copy build_vc14_cpu\\Release\\libmxnet.dll pkg_vc14_cpu\\build
-              xcopy python pkg_vc14_cpu\\python /E /I /Y
-              xcopy include pkg_vc14_cpu\\include /E /I /Y
-              xcopy dmlc-core\\include pkg_vc14_cpu\\include /E /I /Y
-              xcopy mshadow\\mshadow pkg_vc14_cpu\\include\\mshadow /E /I /Y
-              xcopy nnvm\\include pkg_vc14_cpu\\nnvm\\include /E /I /Y
-              del /Q *.7z
-              7z.exe a vc14_cpu.7z pkg_vc14_cpu\\
-              '''
-            stash includes: 'vc14_cpu.7z', name: 'vc14_cpu'
+              bat '''rmdir /s/q pkg_vc14_cpu
+                mkdir pkg_vc14_cpu\\lib
+                mkdir pkg_vc14_cpu\\python
+                mkdir pkg_vc14_cpu\\include
+                mkdir pkg_vc14_cpu\\build
+                copy build_vc14_cpu\\Release\\libmxnet.lib pkg_vc14_cpu\\lib
+                copy build_vc14_cpu\\Release\\libmxnet.dll pkg_vc14_cpu\\build
+                xcopy python pkg_vc14_cpu\\python /E /I /Y
+                xcopy include pkg_vc14_cpu\\include /E /I /Y
+                xcopy dmlc-core\\include pkg_vc14_cpu\\include /E /I /Y
+                xcopy mshadow\\mshadow pkg_vc14_cpu\\include\\mshadow /E /I /Y
+                xcopy nnvm\\include pkg_vc14_cpu\\nnvm\\include /E /I /Y
+                del /Q *.7z
+                7z.exe a vc14_cpu.7z pkg_vc14_cpu\\
+                '''
+              stash includes: 'vc14_cpu.7z', name: 'vc14_cpu'
+            }
           }
         }
       }
     },
     //Todo: Set specific CUDA_ARCh for windows builds in cmake
     'Build GPU windows':{
       node('mxnetwindows-cpu') {
-        ws('workspace/build-gpu') {
-          withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas', 'OpenCV_DIR=C:\\mxnet\\opencv_vc14', 'CUDA_PATH=C:\\CUDA\\v8.0']) {
-           init_git_win()
-           bat """mkdir build_vc14_gpu
-             call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
-             cd build_vc14_gpu
-             cmake -G \"NMake Makefiles JOM\" -DUSE_CUDA=1 -DUSE_CUDNN=1 -DUSE_NVRTC=1 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 -DCUDA_ARCH_NAME=All -DCMAKE_CXX_FLAGS_RELEASE="/FS /MD /O2 /Ob2 /DNDEBUG" -DCMAKE_BUILD_TYPE=Release ${env.WORKSPACE}"""
-           bat 'C:\\mxnet\\build_vc14_gpu.bat'
-           bat '''rmdir /s/q pkg_vc14_gpu
-             mkdir pkg_vc14_gpu\\lib
-             mkdir pkg_vc14_gpu\\python
-             mkdir pkg_vc14_gpu\\include
-             mkdir pkg_vc14_gpu\\build
-             copy build_vc14_gpu\\libmxnet.lib pkg_vc14_gpu\\lib
-             copy build_vc14_gpu\\libmxnet.dll pkg_vc14_gpu\\build
-             xcopy python pkg_vc14_gpu\\python /E /I /Y
-             xcopy include pkg_vc14_gpu\\include /E /I /Y
-             xcopy dmlc-core\\include pkg_vc14_gpu\\include /E /I /Y
-             xcopy mshadow\\mshadow pkg_vc14_gpu\\include\\mshadow /E /I /Y
-             xcopy nnvm\\include pkg_vc14_gpu\\nnvm\\include /E /I /Y
-             del /Q *.7z
-             7z.exe a vc14_gpu.7z pkg_vc14_gpu\\
-             '''
-           stash includes: 'vc14_gpu.7z', name: 'vc14_gpu'
+        timeout(time: max_time, unit: 'MINUTES') {
+          ws('workspace/build-gpu') {
+            withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas', 'OpenCV_DIR=C:\\mxnet\\opencv_vc14', 'CUDA_PATH=C:\\CUDA\\v8.0']) {
+            init_git_win()
+            bat """mkdir build_vc14_gpu
+              call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
+              cd build_vc14_gpu
+              cmake -G \"NMake Makefiles JOM\" -DUSE_CUDA=1 -DUSE_CUDNN=1 -DUSE_NVRTC=1 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 -DCUDA_ARCH_NAME=All -DCMAKE_CXX_FLAGS_RELEASE="/FS /MD /O2 /Ob2 /DNDEBUG" -DCMAKE_BUILD_TYPE=Release ${env.WORKSPACE}"""
+            bat 'C:\\mxnet\\build_vc14_gpu.bat'
+            bat '''rmdir /s/q pkg_vc14_gpu
+              mkdir pkg_vc14_gpu\\lib
+              mkdir pkg_vc14_gpu\\python
+              mkdir pkg_vc14_gpu\\include
+              mkdir pkg_vc14_gpu\\build
+              copy build_vc14_gpu\\libmxnet.lib pkg_vc14_gpu\\lib
+              copy build_vc14_gpu\\libmxnet.dll pkg_vc14_gpu\\build
+              xcopy python pkg_vc14_gpu\\python /E /I /Y
+              xcopy include pkg_vc14_gpu\\include /E /I /Y
+              xcopy dmlc-core\\include pkg_vc14_gpu\\include /E /I /Y
+              xcopy mshadow\\mshadow pkg_vc14_gpu\\include\\mshadow /E /I /Y
+              xcopy nnvm\\include pkg_vc14_gpu\\nnvm\\include /E /I /Y
+              del /Q *.7z
+              7z.exe a vc14_gpu.7z pkg_vc14_gpu\\
+              '''
+            stash includes: 'vc14_gpu.7z', name: 'vc14_gpu'
+            }
           }
         }
       }
@@ -450,65 +456,73 @@ try {
     },
     'Python 2: CPU Win':{
       node('mxnetwindows-cpu') {
-        ws('workspace/ut-python-cpu') {
-          init_git_win()
-          unstash 'vc14_cpu'
-          bat '''rmdir /s/q pkg_vc14_cpu
-            7z x -y vc14_cpu.7z'''
-          bat """xcopy C:\\mxnet\\data data /E /I /Y
-            xcopy C:\\mxnet\\model model /E /I /Y
-            call activate py2
-            set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
-            del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
-            C:\\mxnet\\test_cpu.bat"""
+        timeout(time: max_time, unit: 'MINUTES') {
+          ws('workspace/ut-python-cpu') {
+            init_git_win()
+            unstash 'vc14_cpu'
+            bat '''rmdir /s/q pkg_vc14_cpu
+              7z x -y vc14_cpu.7z'''
+            bat """xcopy C:\\mxnet\\data data /E /I /Y
+              xcopy C:\\mxnet\\model model /E /I /Y
+              call activate py2
+              set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
+              del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
+              C:\\mxnet\\test_cpu.bat"""
+          }
         }
        }
     },
     'Python 3: CPU Win': {
-       node('mxnetwindows-cpu') {
-       ws('workspace/ut-python-cpu') {
-         init_git_win()
-         unstash 'vc14_cpu'
-         bat '''rmdir /s/q pkg_vc14_cpu
-           7z x -y vc14_cpu.7z'''
-         bat """xcopy C:\\mxnet\\data data /E /I /Y
-           xcopy C:\\mxnet\\model model /E /I /Y
-           call activate py3
-           set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
-           del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
-           C:\\mxnet\\test_cpu.bat"""
-         }
+      node('mxnetwindows-cpu') {
+        timeout(time: max_time, unit: 'MINUTES') {
+          ws('workspace/ut-python-cpu') {
+            init_git_win()
+            unstash 'vc14_cpu'
+            bat '''rmdir /s/q pkg_vc14_cpu
+              7z x -y vc14_cpu.7z'''
+            bat """xcopy C:\\mxnet\\data data /E /I /Y
+              xcopy C:\\mxnet\\model model /E /I /Y
+              call activate py3
+              set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_cpu\\python
+              del /S /Q ${env.WORKSPACE}\\pkg_vc14_cpu\\python\\*.pyc
+              C:\\mxnet\\test_cpu.bat"""
+          }
+        }
       }
     },
     'Python 2: GPU Win':{
       node('mxnetwindows-gpu') {
-        ws('workspace/ut-python-gpu') {
+        timeout(time: max_time, unit: 'MINUTES') {
+          ws('workspace/ut-python-gpu') {
+            init_git_win()
+            unstash 'vc14_gpu'
+            bat '''rmdir /s/q pkg_vc14_gpu
+              7z x -y vc14_gpu.7z'''
+            bat """xcopy C:\\mxnet\\data data /E /I /Y
+              xcopy C:\\mxnet\\model model /E /I /Y
+              call activate py2
+              set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
+              del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
+              C:\\mxnet\\test_gpu.bat"""
+          }
+        }
+      }
+    },
+    'Python 3: GPU Win':{
+      node('mxnetwindows-gpu') {
+        timeout(time: max_time, unit: 'MINUTES') {
+          ws('workspace/ut-python-gpu') {
           init_git_win()
           unstash 'vc14_gpu'
           bat '''rmdir /s/q pkg_vc14_gpu
             7z x -y vc14_gpu.7z'''
           bat """xcopy C:\\mxnet\\data data /E /I /Y
             xcopy C:\\mxnet\\model model /E /I /Y
-            call activate py2
+            call activate py3
             set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
             del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
             C:\\mxnet\\test_gpu.bat"""
-        }
-      }
-    },
-    'Python 3: GPU Win':{
-      node('mxnetwindows-gpu') {
-        ws('workspace/ut-python-gpu') {
-         init_git_win()
-         unstash 'vc14_gpu'
-         bat '''rmdir /s/q pkg_vc14_gpu
-           7z x -y vc14_gpu.7z'''
-         bat """xcopy C:\\mxnet\\data data /E /I /Y
-           xcopy C:\\mxnet\\model model /E /I /Y
-           call activate py3
-           set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu\\python
-           del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu\\python\\*.pyc
-           C:\\mxnet\\test_gpu.bat"""
+          }
         }
       }
     }
@@ -554,11 +568,9 @@ try {
   stage('Deploy') {
     node('mxnetlinux-cpu') {
       ws('workspace/docs') {
-        if (env.BRANCH_NAME == "master") {
-          init_git()
-          sh "make clean"
-          sh "make docs"
-        }
+        init_git()
+        sh "make clean"
+        sh "make docs"
       }
     }
   }

R-package/.gitignore

@@ -1,6 +1,7 @@
 .Rhistory
-R-package.Rproj
-*.Rproj
+.RData
+.Ruserdata
+*.Rproj*
 *.o
 *.so
 *.html

R-package/tests/testthat/test_model.R

@@ -172,6 +172,7 @@ test_that("Fine-tune", {
 })                                       
 
 test_that("Matrix Factorization", {
+  skip("Disabled due to an unavailible http server.  Tracked here: https://git.io/vNkrE")
   GetMovieLens()
   DF <- read.table("./data/ml-100k/u.data", header = F, sep = "\t")
   names(DF) <- c("user", "item", "score", "time")