Alekh current cluster parallel patch

1 files changed, 6 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 73803481..3b175fdf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 COMPILER = g++
 LIBS = -l boost_program_options -l pthread -l z
-BOOST_INCLUDE = /usr/local/include
+
+#LIBS = -l boost_program_options-gcc34 -l pthread -l z
+BOOST_INCLUDE = /usr/include
+#BOOST_INCLUDE = /usr/local/include
 BOOST_LIBRARY = /usr/local/lib
 
 ARCH = -march=nocona 
@@ -55,10 +58,10 @@ gd_mf.o:	gd.h
 allreduce_master: allreduce_master.o
 	$(COMPILER) $(FLAGS) -o $@ $+ 
 
-vw: hash.o  global_data.o delay_ring.o message_relay.o io.o parse_regressor.o  parse_primitives.o unique_sort.o cache.o simple_label.o parse_example.o multisource.o sparse_dense.o  network.o parse_args.o gd.o gd_mf.o allreduce.o cg.o bfgs.o noop.o parser.o vw.o loss_functions.o sender.o main.o
+vw: hash.o  global_data.o delay_ring.o message_relay.o io.o parse_regressor.o  parse_primitives.o unique_sort.o cache.o simple_label.o parse_example.o multisource.o sparse_dense.o  network.o parse_args.o allreduce.o accumulate.o gd.o gd_mf.o cg.o bfgs.o noop.o parser.o vw.o loss_functions.o sender.o main.o
 	$(COMPILER) $(FLAGS) -L$(BOOST_LIBRARY) -o $@ $+ $(LIBS)
 
-lda: hash.o  global_data.o delay_ring.o message_relay.o io.o parse_regressor.o  parse_primitives.o unique_sort.o cache.o simple_label.o parse_example.o multisource.o sparse_dense.o  network.o parse_args.o gd.o lda_core.o noop.o parser.o loss_functions.o sender.o lda.o
+lda: hash.o  global_data.o delay_ring.o message_relay.o io.o parse_regressor.o  parse_primitives.o unique_sort.o cache.o simple_label.o parse_example.o multisource.o sparse_dense.o  network.o parse_args.o allreduce.o accumulate.o gd.o lda_core.o noop.o parser.o loss_functions.o sender.o lda.o
 	$(COMPILER) $(FLAGS) -L$(BOOST_LIBRARY) -o $@ $+ $(LIBS)
 
 active_interactor:	active_interactor.cc