merge with lastest master

.gitignore

@@ -62,9 +62,11 @@ __pycache__
 *.json
 *.d
 build
+cmake-build-debug
+cmake-build-release
+cmake-build
 data
 recommonmark
-bin
 deps
 
 # R
@@ -85,6 +87,7 @@ R-package/R/mxnet_generated.R
 *ubyte
 *.bin
 *.txt
+!CMakeLists.txt
 
 # ipython notebook
 *_pb2.py
@@ -141,7 +144,12 @@ tools/pip_package/mxnet.egg-info
 tools/pip_package/mxnet
 
 # temporary path for building dependencies when building wheel
-deps/
-
+./deps/
+bld
+./tmp/*
 *.jar
-target
+target
+cmake-build
+
+
+bin/im2rec

.gitmodules

@@ -13,4 +13,4 @@
 [submodule "cub"]
 	path = cub
 	url = https://github.com/NVlabs/cub
-	shallow = true
+  shallow=true

.travis.yml

@@ -6,6 +6,8 @@ os:
   # - linux
   - osx
 
+osx_image: xcode8
+
 env:
   # code analysis
   # - TASK=lint
@@ -21,9 +23,19 @@ env:
 
   # TODO, R test, distributed test, clang, more g++ versions
 
-# matrix:
-#   exclude:
-#     - os: osx
+matrix:
+  include:
+    - # os: linux
+      # dist: trusty
+      # env: TASK=perl_test
+    - os: osx
+      ## sudo is required because
+      ## prexexisting packages conflict
+      ## with new ones.
+      ## would be nice to have macports
+      ## on travis osx, it has all needed perl packages
+      sudo: required
+      env: TASK=perl_test
 #       env: TASK=julia JULIA_VER=0.4
 #     - os: linux
 #       env: TASK=build
@@ -57,6 +69,11 @@ addons:
       - python3-dev
       - python3-nose
       - graphviz
+      - libmouse-perl
+      - pdl
+      - cpanminus
+      - swig
+      - libgraphviz-perl
 
 before_install:
   - export NVCC_PREFIX=${HOME}