Merge commit '57b5d7873f4f0953357e9d98e9c60cff8373d7ec'

2015-03-09 13:28:38 -07:00
parent 66cf88f7b0 57b5d7873f
commit 9f7c6fe271
43 changed files with 1797 additions and 235 deletions
--- a/subtree/rabit/rabit-learn/kmeans/Makefile
+++ b/subtree/rabit/rabit-learn/kmeans/Makefile
@@ -6,11 +6,10 @@ MPIBIN = kmeans.mpi
 OBJ = kmeans.o

 # common build script for programs
-include ../common.mk
+include ../make/common.mk

 # dependenies here
 kmeans.rabit: kmeans.o lib
 kmeans.mock: kmeans.o lib
 kmeans.mpi: kmeans.o libmpi
 kmeans.o: kmeans.cc ../../src/*.h
-