Merge pull request apache#23 from huangzehao/master

update to 0.11.0.rc2

.gitattributes

@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+R-package/* export-ignore

.gitignore

@@ -129,7 +129,7 @@ lib
 .DS_Store
 
 #Notebook Automated Test
-!tests/nightly/test_config.txt
+!tests/nightly/test_tutorial_config.txt
 !tests/nightly/TestNotebook
 
 # pip building tools

.gitmodules

@@ -10,7 +10,9 @@
 [submodule "nnvm"]
 	path = nnvm
 	url = https://github.com/dmlc/nnvm
+[submodule "dlpack"]
+	path = dlpack
+	url = https://github.com/dmlc/dlpack
 [submodule "cub"]
 	path = cub
-	url = https://github.com/NVlabs/cub
-  shallow=true
+	url = https://github.com/dmlc/cub.git

.travis.yml

@@ -68,6 +68,8 @@ addons:
       - python3-numpy
       - python3-dev
       - python3-nose
+      - python-h5py
+      - python3-h5py
       - graphviz
       - libmouse-perl
       - pdl

CMakeLists.txt

@@ -13,6 +13,7 @@ mxnet_option(USE_OPENCV           "Build with OpenCV support" ON)
 mxnet_option(USE_OPENMP           "Build with Openmp support" ON)
 mxnet_option(USE_CUDA             "Build with CUDA support"   ON)
 mxnet_option(USE_CUDNN            "Build with cudnn support"  ON) # one could set CUDNN_ROOT for search path
+mxnet_option(USE_LAPACK           "Build with lapack support" ON IF NOT MSVC)
 mxnet_option(USE_MKL_IF_AVAILABLE "Use MKL if found" ON)
 mxnet_option(USE_MKLML_MKL        "Use MKLML variant of MKL (if MKL found)" ON IF USE_MKL_IF_AVAILABLE AND UNIX AND (NOT APPLE))
 mxnet_option(USE_MKL_EXPERIMENTAL "Use experimental MKL (if MKL enabled and found)" OFF)
@@ -142,6 +143,12 @@ include_directories("mshadow")
 include_directories("cub")
 include_directories("nnvm/include")
 include_directories("dmlc-core/include")
+include_directories("dlpack/include")
+
+# commented out until PR goes through
+#if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/dlpack)
+#  add_subdirectory(dlpack)
+#endif()
 
 if(NOT MSVC)
   set(BEGIN_WHOLE_ARCHIVE -Wl,--whole-archive)
@@ -176,7 +183,11 @@ if(USE_OPENCV)
   message(STATUS "OpenCV found (${OpenCV_CONFIG_PATH})")
   add_definitions(-DMXNET_USE_OPENCV=1)
   if(NOT MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined")
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-undefined,error")
+    else()
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined")
+    endif()
   endif()
 else(USE_OPENCV)
   message(STATUS "OpenCV Disabled")
@@ -191,8 +202,21 @@ if(USE_OPENMP)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
   endif()
+elseif(UNIX)
+  list(APPEND mxnet_LINKER_LIBS pthread)
+endif()
+
+if(USE_LAPACK)
+  add_definitions(-DMXNET_USE_LAPACK=1)
+  list(APPEND mxnet_LINKER_LIBS lapack)
+else(USE_LAPACK)
+  # Workaround for Windows until using new Jenkinsfile.
+  if(USE_BLAS STREQUAL "open")
+    add_definitions(-DMXNET_USE_LAPACK=1)
+  endif()
 endif()
 
+
 if(UNIX)
   find_library(RTLIB rt)
   if(RTLIB)
@@ -329,8 +353,10 @@ if(USE_CUDA)
     list(APPEND mxnet_LINKER_LIBS ${CUDA_cuda_LIBRARY})
     FIND_LIBRARY(CUDA_cufft_LIBRARY nvrtc "${CUDA_TOOLKIT_ROOT_DIR}/lib/x64"  "${CUDA_TOOLKIT_ROOT_DIR}/lib/win32")
     list(APPEND mxnet_LINKER_LIBS "${CUDA_cufft_LIBRARY}/../cufft.lib") # For fft operator
+    FIND_LIBRARY(CUDA_cusolver_LIBRARY nvrtc "${CUDA_TOOLKIT_ROOT_DIR}/lib/x64"  "${CUDA_TOOLKIT_ROOT_DIR}/lib/win32")
+    list(APPEND mxnet_LINKER_LIBS "${CUDA_cusolver_LIBRARY}/../cusolver.lib") # For cusolver 
   else(MSVC)
-    list(APPEND mxnet_LINKER_LIBS nvrtc cuda cufft)
+    list(APPEND mxnet_LINKER_LIBS nvrtc cuda cufft cusolver)
     link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
   endif()
   list(APPEND SOURCE ${cuda_objs} ${CUDA})
@@ -425,7 +451,6 @@ if(USE_PROFILER)
 	add_definitions(-DMXNET_USE_PROFILER)
 endif()
 
-# Do tests after chrpath so that we use the "real" cuda driver
 add_subdirectory(tests)
 
 # AUTO_INSTALL_DIR -> Optional: specify post-build install direcory
@@ -458,7 +483,10 @@ if(USE_CPP_PACKAGE)
   add_subdirectory(cpp-package)
 endif()
 
-add_subdirectory(example/image-classification/predict-cpp)
+# Problems on Mac OS X: 1. librt not available 2. mxnet built as MODULE library, which can't be linked.
+if(!${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+  add_subdirectory(example/image-classification/predict-cpp)
+endif()
 
 # ---[ Linter target
 if(MSVC)

CONTRIBUTORS.md

@@ -137,3 +137,12 @@ List of Contributors
 * [Roshani Nagmote](https://github.com/Roshrini)
 * [Chetan Khatri](https://github.com/chetkhatri/)
 * [James Liu](https://github.com/jamesliu/)
+* [Nir Ben-Zvi](https://github.com/nirbenz/)
+* [Arik Poznanski](https://github.com/arikpoz/)
+* [Yuwen Xiong](https://github.com/Orpine/)
+* [Haozhi Qi](https://github.com/Oh233/)
+* [Yi Li](https://github.com/liyi14/)
+* [Guodong Zhang](https://github.com/gd-zhang/)
+* [Xizhou Zhu](https://github.com/einsiedler0408/)
+* [Jean Kossaifi](https://github.com/JeanKossaifi/)
+* [Kenta Kubo](https://github.com/kkk669/)

DISCLAIMER

@@ -0,0 +1,12 @@
+Apache MXNet (incubating) is an effort undergoing incubation at The
+Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted
+projects until a further review indicates that the
+infrastructure, communications, and decision making process have
+stabilized in a manner consistent with other successful ASF
+projects.
+
+While incubation status is not necessarily a reflection
+of the completeness or stability of the code, it does indicate
+that the project has yet to be fully endorsed by the ASF.