From dd8d9646c4bba6b1a023050d996a1f5624cd028d Mon Sep 17 00:00:00 2001 From: tqchen Date: Mon, 22 Dec 2014 01:25:06 -0800 Subject: [PATCH] rm mpi dep --- toolkit/Makefile | 10 ++++++---- toolkit/kmeans_hadoop.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/toolkit/Makefile b/toolkit/Makefile index 01a3cd83a..b8035f62b 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -9,18 +9,20 @@ BIN = kmeans.rabit # objectives that makes up rabit library OBJ = kmeans.o MPIBIN = kmeans.mpi -.PHONY: clean all lib +.PHONY: clean all lib libmpi -all: $(BIN) +all: $(BIN) lib: - cd ..;make;cd - + cd ..;make lib/librabit.a;cd - +libmpi: + cd ..;make lib/librabit_mpi.a;cd - kmeans.o: kmeans.cpp ../src/*.h # we can link against MPI version to get use MPI kmeans.rabit: kmeans.o lib -kmeans.mpi: kmeans.o lib +kmeans.mpi: kmeans.o libmpi $(BIN) : $(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc, $^) $(LDFLAGS) -lrabit diff --git a/toolkit/kmeans_hadoop.sh b/toolkit/kmeans_hadoop.sh index d9a86bddd..23c3df688 100755 --- a/toolkit/kmeans_hadoop.sh +++ b/toolkit/kmeans_hadoop.sh @@ -6,4 +6,4 @@ then fi #set path to hadoop streaming jar here STREAMING_JAR= -python ../rabit_hadoop.py -hs $STREAMING_JAR -s $1 -i $2 -m kmeans.rabit --args "stdin "$3" "$4" stdout" -o $5 +python ../tracker/rabit_hadoop.py -hs $STREAMING_JAR -s $1 -i $2 -m kmeans.rabit --args "stdin "$3" "$4" stdout" -o $5