tiny update in makefile for ps

yanqingmen · Jun 19, 2015 · 4721861 · 4721861
1 parent b77c463
commit 4721861
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -105,7 +105,7 @@ endif
 .PHONY: clean all
 
 ifeq ($(USE_DIST_PS), 1)
-STATIC_DEPS = 1
+# STATIC_DEPS = 1
 DEPS_PATH = $(PS_PATH)/deps
 include $(PS_PATH)/make/ps.mk
  LDFLAGS += $(PS_LDFLAGS)
@@ -140,7 +140,7 @@ main.o: src/cxxnet_main.cpp
 
 wrapper/libcxxnetwrapper.so: wrapper/cxxnet_wrapper.cpp $(OBJ) $(OBJCXX11) $(LIB_DEP) $(CUDEP)
 bin/cxxnet: src/local_main.cpp $(OBJ) $(OBJCXX11) $(LIB_DEP) $(CUDEP)
-bin/cxxnet.ps: $(OBJ) $(OBJCXX11) $(CUDEP) $(LIB_DEP) $(PS_PATH)/build/libps.a
+bin/cxxnet.ps: $(PS_PATH)/build/libps.a $(OBJ) $(OBJCXX11) $(CUDEP) $(LIB_DEP)
 bin/im2rec: tools/im2rec.cc $(DMLC_CORE)/libdmlc.a
 bin/bin2rec: tools/bin2rec.cc $(DMLC_CORE)/libdmlc.a
 bin/caffe_converter: tools/caffe_converter/convert.cpp $(OBJ) $(OBJCXX11) $(LIB_DEP) $(CUDEP)

diff --git a/build_ps.sh b/build_ps.sh
@@ -29,5 +29,6 @@ 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 -C ps-lite -j4
 make -j4
 # make $1