update linear method

Author: mli

Makefile

@@ -16,22 +16,29 @@ INCPATH = -I./src -I$(THIRD_PATH)/include
 CFLAGS = -std=c++0x $(WARN) $(OPT) $(INCPATH)
 LDFLAGS += ./build/libps.a $(THIRD_LIB) -lpthread -lrt
 
-all: ps build/hello
+all: ps app
 clean:
 	rm -rf build
 
 ps: build/libps.a
+app: build/ps
 
 build/hello: build/app/hello_world/main.o build/libps.a
 	$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
 
+
 sys_srcs	= $(wildcard src/*/*.cc)
 sys_protos	= $(wildcard src/*/proto/*.proto)
 sys_objs	= $(patsubst src/%.proto, build/%.pb.o, $(sys_protos)) \
 		      $(patsubst src/%.cc, build/%.o, $(sys_srcs))
 build/libps.a: $(sys_objs)
 	ar crv $@ $?
 
+app_objs = $(addprefix build/app/, main/proto/app.pb.o linear_method/linear.o linear_method/proto/linear.pb.o)
+
+build/ps:  build/app/main/main.o $(app_objs) build/libps.a
+	echo $(app_objs)
+	$(CC) $(CFLAGS) $< $(app_objs) $(LDFLAGS) -o $@
 
 build/%.o: src/%.cc
 	@mkdir -p $(@D)
@@ -42,8 +49,3 @@ build/%.o: src/%.cc
 	${THIRD_PATH}/bin/protoc --cpp_out=./src --proto_path=./src $<
 
 -include build/*/*.d
-
-# test :
-# 	make -C src test -j8
-# clean :
-# 	make -C src clean

README.org

@@ -19,4 +19,4 @@ See more details in [[https://github.com/mli/parameter_server/wiki/setup][wiki]]
 
 *Run*
 
-See examples in [[config/rcv1]]. More information are in the [[https://github.com/mli/parameter_server/wiki][wiki]].
+See examples in [[example/rcv1]]. More information are in the [[https://github.com/mli/parameter_server/wiki][wiki]].

example/ctr/batch_l1lr.conf

@@ -1,6 +1,4 @@
 # configuration to run l1-regularized logistic regression on the ctr dataset
-app_name: "ctr"
-
 linear_method {
 
 training_data {

example/rcv1/batch_l1lr.conf

@@ -1,4 +1,3 @@
-app_name: "rcv1"
 linear_method {
 
 training_data {

example/rcv1/eval_batch.conf

@@ -1,4 +1,3 @@
-app_name: "eval_rcv1"
 linear_method {
 
 validation_data {

example/rcv1/eval_online.conf

@@ -1,4 +1,3 @@
-app_name: "eval_rcv1"
 linear_method {
 
 validation_data {

example/rcv1/online_l1lr.conf

@@ -1,5 +1,4 @@
 # configuration for running l1-regularized logistic regression on data RCV1
-
 linear_method {
 training_data {
 format: TEXT

script/local.sh

@@ -9,7 +9,7 @@ fi
 dir=`dirname "$0"`
 cd ${dir}
 
-killall -q ps
+# killall -q ${bin}
 
 bin=$1
 shift

src/app/linear_method/BUILD

@@ -4,7 +4,7 @@
 #include "util/evaluation.h"
 #include "parameter/kv_vector.h"
 #include "parameter/kv_store.h"
-#include "linear_method/learning_rate.h"
+#include "app/linear_method/learning_rate.h"
 namespace PS {
 namespace LM {