refactor code style, reset link still need thoughts

This commit is contained in:
tqchen
2014-11-29 20:15:27 -08:00
parent 42505f473d
commit 5b0bb53184
11 changed files with 1045 additions and 1199 deletions

View File

@@ -12,23 +12,25 @@ endif
# specify tensor path
BIN = test_allreduce
OBJ = engine_robust.o engine_tcp.o
OBJ = engine_base.o engine_robust.o engine.o
.PHONY: clean all
all: $(BIN) $(MPIBIN)
engine_tcp.o: ../src/engine_tcp.cpp ../src/*.h
engine_robust.o: ../src/engine_robust.cpp ../src/*.h
test_allreduce: test_allreduce.cpp ../src/*.h engine_robust.o
engine_base.o: ../src/engine_base.cc ../src/*.h
engine.o: ../src/engine.cc ../src/*.h
engine_robust.o: ../src/engine_robust.cc ../src/*.h
test_allreduce: test_allreduce.cpp ../src/*.h $(OBJ)
$(BIN) :
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.cpp %.o %.c, $^)
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc, $^)
$(OBJ) :
$(CXX) -c $(CFLAGS) -o $@ $(firstword $(filter %.cpp %.c, $^) )
$(CXX) -c $(CFLAGS) -o $@ $(firstword $(filter %.cpp %.c %.cc, $^) )
$(MPIBIN) :
$(MPICXX) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.cpp %.o %.c, $^)
$(MPICXX) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc, $^)
clean:
$(RM) $(OBJ) $(BIN) $(MPIBIN) *~ ../src/*~

View File

@@ -74,11 +74,11 @@ int main(int argc, char *argv[]) {
test::Mock mock(rank, argv[2], argv[3]);
printf("[%d] start at %s\n", rank, name.c_str());
utils::LogPrintf("[%d] start at %s\n", rank, name.c_str());
TestMax(mock, n);
printf("[%d] !!!TestMax pass\n", rank);
utils::LogPrintf("[%d] !!!TestMax pass\n", rank);
TestSum(mock, n);
printf("[%d] !!!TestSum pass\n", rank);
utils::LogPrintf("[%d] !!!TestSum pass\n", rank);
sync::Finalize();
printf("[%d] all check pass\n", rank);
return 0;