From c8396ca24eb82994038574373af95126afcd0a63 Mon Sep 17 00:00:00 2001 From: tqchen Date: Sun, 21 Dec 2014 18:47:56 -0800 Subject: [PATCH] add mock exec --- Makefile | 9 +++++++-- multi-node/col-split/mushroom-col-rabit-mock.sh | 2 +- multi-node/row-split/machine-row-rabit-mock.sh | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5738f2573..7c89d24da 100644 --- a/Makefile +++ b/Makefile @@ -17,14 +17,15 @@ else endif # specify tensor path -BIN = xgboost +BIN = xgboost +MOCKBIN = xgboost-mock OBJ = updater.o gbm.o io.o main.o MPIBIN = xgboost-mpi SLIB = wrapper/libxgboostwrapper.so .PHONY: clean all mpi python Rpack librabit librabit_mpi -all: $(BIN) $(OBJ) $(SLIB) mpi +all: $(BIN) $(OBJ) $(SLIB) $(MOCKBIN) mpi: $(MPIBIN) # rules to get rabit library @@ -42,10 +43,14 @@ gbm.o: src/gbm/gbm.cpp src/gbm/*.hpp src/gbm/*.h io.o: src/io/io.cpp src/io/*.hpp src/utils/*.h src/learner/dmatrix.h src/*.h main.o: src/xgboost_main.cpp src/utils/*.h src/*.h src/learner/*.hpp src/learner/*.h xgboost-mpi: updater.o gbm.o io.o main.o librabit_mpi +xgboost-mock: updater.o gbm.o io.o main.o librabit xgboost: updater.o gbm.o io.o main.o librabit wrapper/libxgboostwrapper.so: wrapper/xgboost_wrapper.cpp src/utils/*.h src/*.h src/learner/*.hpp src/learner/*.h updater.o gbm.o io.o librabit $(BIN) : + $(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c, $^) $(LDFLAGS) -lrabit + +$(MOCKBIN) : $(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c, $^) $(LDFLAGS) -lrabit_mock $(SLIB) : diff --git a/multi-node/col-split/mushroom-col-rabit-mock.sh b/multi-node/col-split/mushroom-col-rabit-mock.sh index 148e629a2..269967419 100755 --- a/multi-node/col-split/mushroom-col-rabit-mock.sh +++ b/multi-node/col-split/mushroom-col-rabit-mock.sh @@ -16,7 +16,7 @@ k=$1 python splitsvm.py ../../demo/data/agaricus.txt.train train $k # run xgboost mpi -../../rabit/tracker/rabit_mpi.py $k local ../../rabit/test/keepalive.sh ../../xgboost mushroom-col.conf dsplit=col mock=0,1,0,0 mock=1,1,0,0 +../../rabit/tracker/rabit_mpi.py $k local ../../rabit/test/keepalive.sh ../../xgboost-mock mushroom-col.conf dsplit=col mock=0,1,0,0 mock=1,1,0,0 # the model can be directly loaded by single machine xgboost solver, as usuall #../../xgboost mushroom-col.conf task=dump model_in=0002.model fmap=../../demo/data/featmap.txt name_dump=dump.nice.$k.txt diff --git a/multi-node/row-split/machine-row-rabit-mock.sh b/multi-node/row-split/machine-row-rabit-mock.sh index b2e04c9c7..f61ef2152 100755 --- a/multi-node/row-split/machine-row-rabit-mock.sh +++ b/multi-node/row-split/machine-row-rabit-mock.sh @@ -17,4 +17,4 @@ cd - python splitrows.py ../../demo/regression/machine.txt.train train-machine $k # run xgboost mpi -../../rabit/tracker/rabit_mpi.py $k local ../../rabit/test/keepalive.sh ../../xgboost machine-row.conf dsplit=row num_round=3 mock=1,1,1,0 +../../rabit/tracker/rabit_mpi.py $k local ../../rabit/test/keepalive.sh ../../xgboost-mock machine-row.conf dsplit=row num_round=3 mock=1,1,1,0