Remove dmlc headers, add optional DMLC_CORE_PATH variable for build p…

…ath (apache#102)

* Remove dmlc headers, add optional DMLC_CORE_PATH variable for build path

* travis.yml doesn't need to clone dmlc-core anymore

.gitignore

@@ -33,7 +33,6 @@
 build
 lib
 *~
-dmlc-core
 cli_test
 *.pyc
 

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "plugin/nnvm-fusion"]
 	path = plugin/nnvm-fusion
 	url = https://github.com/dmlc/nnvm-fusion.git
+[submodule "dmlc-core"]
+	path = dmlc-core
+	url = https://github.com/dmlc/dmlc-core

.travis.yml

@@ -37,7 +37,6 @@ addons:
       - graphviz
 
 before_install:
-  - git clone https://github.com/dmlc/dmlc-core
   - source dmlc-core/scripts/travis/travis_setup_env.sh
   - export PYTHONPATH=${PYTHONPATH}:${PWD}/python
 

CMakeLists.txt

@@ -51,6 +51,12 @@ mxnet_source_group("Source\\pass"   GLOB "src/pass/*.cc")
 
 FILE(GLOB_RECURSE SOURCE "src/*.cc" "src/*.h" "include/*.h")
 
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/dmlc-core/CMakeLists.txt)
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/dmlc-core/include)
+elseif(DMLC_CORE_PATH)
+  include_directories(${DMLC_CORE_PATH}/include)
+endif()
+
 add_library(nnvm ${SOURCE})
 target_link_libraries(nnvm ${nnvm_LINKER_LIBS})
 

Makefile

@@ -12,6 +12,12 @@ include $(config)
 export LDFLAGS = -pthread -lm
 export CFLAGS = -std=c++11 -Wall -O2 -Iinclude -fPIC
 
+ifdef DMLC_CORE_PATH
+  CFLAGS += -I$(DMLC_CORE_PATH)/include
+else
+  CFLAGS += -I$(ROOTDIR)/dmlc-core/include
+endif
+
 ifneq ($(ADD_CFLAGS), NONE)
 	CFLAGS += $(ADD_CFLAGS)
 endif