From 57d96f88e1d59f4ed6173602a44b1380fed30a4e Mon Sep 17 00:00:00 2001 From: wanghaoshuang Date: Wed, 16 Aug 2017 16:15:12 +0800 Subject: [PATCH 1/3] Fix document error. --- python/paddle/v2/trainer.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python/paddle/v2/trainer.py b/python/paddle/v2/trainer.py index 9c4dd5f250..1daf23a738 100644 --- a/python/paddle/v2/trainer.py +++ b/python/paddle/v2/trainer.py @@ -27,16 +27,21 @@ class SGD(object): SGD Trainer combines data reader, network topolopy and update_equation together to train/test a neural network. - :param update_equation: The optimizer object. - :type update_equation: paddle.v2.optimizer.Optimizer :param cost: Target cost that neural network should be optimized. :type cost: paddle.v2.config_base.Layer :param parameters: The parameters dictionary. :type parameters: paddle.v2.parameters.Parameters + :param update_equation: The optimizer object. + :type update_equation: paddle.v2.optimizer.Optimizer :param extra_layers: Some layers in the neural network graph are not in the path of cost layer. - :param pserver_spec: pserver location, eg: localhost:3000 :type extra_layers: paddle.v2.config_base.Layer + :param is_local: Whether trainning locally + :type is_local: bool + :param pserver_spec: pserver location, eg: localhost:3000 + :type pserver_spec: string + :param use_etcd: Whether using etcd pserver. + :param use_etcd: bool """ def __init__(self, From fd107ae550be7e93e45a88bc2826a9be803dd710 Mon Sep 17 00:00:00 2001 From: wanghaoshuang Date: Wed, 16 Aug 2017 17:00:57 +0800 Subject: [PATCH 2/3] Modify pserver_spec's doc. --- python/paddle/v2/trainer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/paddle/v2/trainer.py b/python/paddle/v2/trainer.py index 1daf23a738..4cf4d8b11d 100644 --- a/python/paddle/v2/trainer.py +++ b/python/paddle/v2/trainer.py @@ -38,7 +38,9 @@ class SGD(object): :type extra_layers: paddle.v2.config_base.Layer :param is_local: Whether trainning locally :type is_local: bool - :param pserver_spec: pserver location, eg: localhost:3000 + :param pserver_spec: pserver location, eg: localhost:3000, + if use_etcd is true, pserver_spec indicates + the etcd endpoints, eg: http://127.0.0.1:2379 :type pserver_spec: string :param use_etcd: Whether using etcd pserver. :param use_etcd: bool From 4be8189a8033010cf3517d14bed30d991780285b Mon Sep 17 00:00:00 2001 From: wanghaoshuang Date: Wed, 16 Aug 2017 19:50:40 +0800 Subject: [PATCH 3/3] Modify pserver_spec's doc. --- python/paddle/v2/trainer.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python/paddle/v2/trainer.py b/python/paddle/v2/trainer.py index 4cf4d8b11d..0654a30104 100644 --- a/python/paddle/v2/trainer.py +++ b/python/paddle/v2/trainer.py @@ -38,9 +38,10 @@ class SGD(object): :type extra_layers: paddle.v2.config_base.Layer :param is_local: Whether trainning locally :type is_local: bool - :param pserver_spec: pserver location, eg: localhost:3000, - if use_etcd is true, pserver_spec indicates - the etcd endpoints, eg: http://127.0.0.1:2379 + :param pserver_spec: comma string for pserver location, + eg:127.10.0.10:3000,127.10.0.11:3000, + and this parameter is only used for fault + tolerant mode cluster training. :type pserver_spec: string :param use_etcd: Whether using etcd pserver. :param use_etcd: bool