Squashed 'subtree/rabit/' changes from 16975b4..b15f6cd

b15f6cd rabit unifires with dmlc
5634ec3 ok
2dd6c2f Merge branch 'master' of ssh://github.com/dmlc/rabit
38d7f99 checkin wormhole spliter
8acb96a Merge pull request #10 from ryanzz/master
911a1f0 fixed a mistake
732d8c3 inteface changing
684ea0a inteface changing
8cb4c02 add dmlc support
be2ff70 allow adapting wormhole

git-subtree-dir: subtree/rabit
git-subtree-split: b15f6cd2ac

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)

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