add psmain

Makefile

@@ -37,7 +37,7 @@ export NVCCFLAGS = --use_fast_math -g -O3 -ccbin $(CXX)
 
 # specify tensor path
 BIN = bin/cxxnet
-OBJ = layer_cpu.o updater_cpu.o nnet_cpu.o data.o
+OBJ = layer_cpu.o updater_cpu.o nnet_cpu.o data.o main.o
 CUOBJ = layer_gpu.o  updater_gpu.o nnet_gpu.o
 CUBIN =
 .PHONY: clean all
@@ -48,11 +48,13 @@ layer_cpu.o layer_gpu.o: src/layer/layer_impl.cpp src/layer/layer_impl.cu src/la
 updater_cpu.o updater_gpu.o: src/updater/updater_impl.cpp src/updater/updater_impl.cu src/layer/layer.h src/updater/*.hpp src/updater/*.h src/utils/*.h
 nnet_cpu.o nnet_gpu.o: src/nnet/nnet_impl.cpp src/nnet/nnet_impl.cu src/layer/layer.h src/updater/updater.h src/utils/*.h src/nnet/*.hpp src/nnet/*.h
 data.o: src/io/data.cpp src/io/*.hpp
+main.o: src/cxxnet_main.cpp 
 
-bin/cxxnet: src/cxxnet_main.cpp $(OBJ) $(CUOBJ)
+bin/cxxnet: src/local_main.cpp $(OBJ) $(CUOBJ)
+bin/cxxnet.ps: $(OBJ) $(CUOBJ) libps.a libps_main.a
 
 $(BIN) :
-	$(CXX) $(CFLAGS)  -o $@ $(filter %.cpp %.o %.c, $^) $(LDFLAGS)
+	$(CXX) $(CFLAGS)  -o $@ $(filter %.cpp %.o %.c %.a, $^) $(LDFLAGS)
 
 $(OBJ) :
 	$(CXX) -c $(CFLAGS) -o $@ $(firstword $(filter %.cpp %.c, $^) )

example/MNIST/MNIST.conf

@@ -5,6 +5,8 @@ iter = mnist
     path_img = "./data/train-images-idx3-ubyte.gz"
     path_label = "./data/train-labels-idx1-ubyte.gz"
     shuffle = 1
+iter = membuffer
+    max_nbatch = 100
 iter = end
 # evaluation iterator
 eval = test

src/cxxnet_main.cpp

@@ -395,7 +395,8 @@ class CXXNetLearnTask {
 };
 }  // namespace cxxnet
 
-int main(int argc, char *argv[]) {
+// general main for PS
+int PSMain(int argc, char *argv[]) {
   cxxnet::CXXNetLearnTask tsk;
   return tsk.Run(argc, argv);
 }

src/local_main.cpp

@@ -0,0 +1,10 @@
+/*!
+ * \file local_main.cpp
+ * \brief local main file that redirect directly to PSMain
+ * \author Tianqi Chen
+ */
+int PSMain(int argc, char *argv[]);
+
+int main(int argc, char *argv[]) {
+  return PSMain(argc, argv);
+}