update makefile for dist-ps

yanqingmen · Jun 19, 2015 · 4928cd9 · 4928cd9
1 parent 0945118
commit 4928cd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -105,6 +105,8 @@ endif
 .PHONY: clean all
 
 ifeq ($(USE_DIST_PS), 1)
+STATIC_DEPS = 1
+DEPS_PATH = $(PS_PATH)/deps
 include $(PS_PATH)/make/ps.mk
  LDFLAGS += $(PS_LDFLAGS)
  BIN=bin/cxxnet.ps
@@ -118,6 +120,9 @@ $(DMLC_CORE)/libdmlc.a:
 $(RABIT_PATH)/lib/librabit_base.a:
  + cd $(RABIT_PATH); make; cd $(ROOTDIR)
 
+$(PS_PATH)/build/libps.a:
+ make -C $(PS_PATH) config=$(ROOTDIR)/$(config)
+
 layer_cpu.o layer_gpu.o: src/layer/layer_impl.cpp src/layer/layer_impl.cu\
  src/layer/*.h src/layer/*.hpp src/utils/*.h src/plugin/*.hpp
 

diff --git a/build_ps.sh b/build_ps.sh
@@ -27,6 +27,7 @@ fi
 
 sed -i 's/USE_DIST_PS.*/USE_DIST_PS = 1/' config.mk
 sed -i 's/PS_PATH.*/PS_PATH = .\/ps-lite/' config.mk
+echo "USE_GLOG = 1" >>config.mk
 
 make -j4
 # make $1