Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix in kmeans

Browse Source
This commit is contained in:
tqchen 2014-12-03 20:05:16 -08:00
parent a1a1a8895e
commit 8175df1002
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
toolkit/Makefile
View File

@ -1,7 +1,7 @@
export CC = gcc export CC = gcc
export CXX = g++ export CXX = g++
export MPICXX = mpicxx export MPICXX = mpicxx
export LDFLAGS= -pthread -lm export LDFLAGS= -pthread -lm -L../lib
export CFLAGS = -Wall -O3 -msse2 -Wno-unknown-pragmas -fPIC -I../src export CFLAGS = -Wall -O3 -msse2 -Wno-unknown-pragmas -fPIC -I../src
# specify tensor path # specify tensor path
@ -12,31 +12,27 @@ MPIOBJ = engine_mpi.o
OBJ = $(RABIT_OBJ) kmeans.o OBJ = $(RABIT_OBJ) kmeans.o
MPIBIN = kmeans.mpi MPIBIN = kmeans.mpi
.PHONY: clean all .PHONY: clean all lib
all: $(BIN) $(MPIBIN) all: $(BIN) $(MPIBIN)
allreduce_base.o: ../src/allreduce_base.cc ../src/*.h lib:
engine.o: ../src/engine.cc ../src/*.h cd ..;make;cd -
allreduce_robust.o: ../src/allreduce_robust.cc ../src/*.h
engine_mpi.o: ../src/engine_mpi.cc
kmeans.o: kmeans.cpp ../src/*.h kmeans.o: kmeans.cpp ../src/*.h
# we can link against MPI version to get use MPI # we can link against MPI version to get use MPI
kmeans: kmeans.o $(RABIT_OBJ) kmeans: kmeans.o lib
kmeans.mpi: kmeans.o $(MPIOBJ) kmeans.mpi: kmeans.o lib
$(BIN) : $(BIN) :
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc, $^) $(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc, $^) $(LDFLAGS) -lrabit
$(OBJ) : $(OBJ) :
$(CXX) -c $(CFLAGS) -o $@ $(firstword $(filter %.cpp %.c %.cc, $^) ) $(CXX) -c $(CFLAGS) -o $@ $(firstword $(filter %.cpp %.c %.cc, $^) )
$(MPIBIN) : $(MPIBIN) :
$(MPICXX) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc, $^) $(MPICXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc %.a, $^) $(LDFLAGS) -lrabit_mpi
$(MPIOBJ) :
$(MPICXX) -c $(CFLAGS) -o $@ $(firstword $(filter %.cpp %.c %.cc, $^) )
clean: clean:
$(RM) $(OBJ) $(BIN) $(MPIBIN) *~ ../src/*~ $(RM) $(OBJ) $(BIN) $(MPIBIN) *~ ../src/*~

4
toolkit/kmeans.cpp
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
Model model; Model model;
int iter = rabit::LoadCheckPoint(&model); int iter = rabit::LoadCheckPoint(&model);
if (iter == 0) { if (iter == 0) {
rabit::Allreduce<op::Max>(&data.feat_dim, sizeof(data.feat_dim)); rabit::Allreduce<op::Max>(&data.feat_dim, 1);
model.InitModel(num_cluster, data.feat_dim); model.InitModel(num_cluster, data.feat_dim);
InitCentroids(data, &model.centroids); InitCentroids(data, &model.centroids);
model.Normalize(); model.Normalize();
@ -121,7 +121,9 @@ int main(int argc, char *argv[]) {
} }
temp[k][num_feat] += 1.0f; temp[k][num_feat] += 1.0f;
} }
// call allreduce
rabit::Allreduce<op::Sum>(&temp.data[0], temp.data.size()); rabit::Allreduce<op::Sum>(&temp.data[0], temp.data.size());
// set number
for (int k = 0; k < num_cluster; ++k) { for (int k = 0; k < num_cluster; ++k) {
float cnt = temp[k][num_feat]; float cnt = temp[k][num_feat];
for (unsigned i = 0; i < num_feat; ++i) { for (unsigned i = 0; i < num_feat; ++i) {