From 5634ec3008242d02dc74be1c0f67d771fef4d997 Mon Sep 17 00:00:00 2001 From: tqchen Date: Fri, 3 Apr 2015 22:25:33 -0700 Subject: [PATCH] ok --- rabit-learn/make/common.mk | 10 +++++----- rabit-learn/make/config.mk | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rabit-learn/make/common.mk b/rabit-learn/make/common.mk index 504cdf803..ae0a16f73 100644 --- a/rabit-learn/make/common.mk +++ b/rabit-learn/make/common.mk @@ -4,12 +4,12 @@ export LDFLAGS= -L../../lib -pthread -lm -lrt export CFLAGS = -Wall -msse2 -Wno-unknown-pragmas -fPIC -I../../include # setup opencv -ifeq ($(USE_WORMHOLE),1) - include ../../wormhole/make/wormhole.mk - CFLAGS+= -DRABIT_USE_WORMHOLE=1 -I ../../wormhole/include $(WORMHOLE_CFLAGS) - LDFLAGS+= -L../../wormhole -lwormhole $(WORMHOLE_LDFLAGS) +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_WORMHOLE=0 + CFLAGS+= -DRABIT_USE_DMLC=0 endif # setup opencv diff --git a/rabit-learn/make/config.mk b/rabit-learn/make/config.mk index 395114fcf..6aa0feef6 100644 --- a/rabit-learn/make/config.mk +++ b/rabit-learn/make/config.mk @@ -17,8 +17,8 @@ export MPICXX = mpicxx # whether use HDFS support during compile USE_HDFS = 1 -# whether use wormhole's io utils -USE_WORMHOLE = 0 +# whether use dmlc's io utils +USE_DMLC = 0 # path to libjvm.so LIBJVM=$(JAVA_HOME)/jre/lib/amd64/server