Merge commit '89244b4aec1f229b9ba1378389d4dea697389666'

subtree/rabit/rabit-learn/make/common.mk

@@ -3,6 +3,15 @@
 export LDFLAGS= -L../../lib -pthread -lm -lrt
 export CFLAGS = -Wall  -msse2  -Wno-unknown-pragmas -fPIC -I../../include  
 
+# setup opencv
+ifeq ($(USE_DMLC),1)
+	include ../../dmlc-core/make/dmlc.mk
+	CFLAGS+= -DRABIT_USE_DMLC=1 -I ../../dmlc-core/include $(DMLC_CFLAGS)
+	LDFLAGS+= -L../../dmlc-core -ldmlc $(DMLC_LDFLAGS)
+else
+	CFLAGS+= -DRABIT_USE_DMLC=0
+endif
+
 # setup opencv
 ifeq ($(USE_HDFS),1)
 	CFLAGS+= -DRABIT_USE_HDFS=1 -I$(HADOOP_HDFS_HOME)/include -I$(JAVA_HOME)/include
@@ -11,6 +20,7 @@ else
 	CFLAGS+= -DRABIT_USE_HDFS=0
 endif
 
+
 .PHONY: clean all lib mpi
 
 all: $(BIN) $(MOCKBIN)

subtree/rabit/rabit-learn/make/config.mk

@@ -17,5 +17,8 @@ export MPICXX = mpicxx
 # whether use HDFS support during compile
 USE_HDFS = 1
 
+# whether use dmlc's io utils
+USE_DMLC = 0
+
 # path to libjvm.so
 LIBJVM=$(JAVA_HOME)/jre/lib/amd64/server