From c1cb483a6c5cdd10956a2659dc76214004e75bb1 Mon Sep 17 00:00:00 2001 From: "yi.wu" Date: Thu, 4 May 2017 22:34:35 +0800 Subject: [PATCH 1/3] paddle.init default use env --- python/paddle/v2/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/python/paddle/v2/__init__.py b/python/paddle/v2/__init__.py index 7c8f6ea62f..7a9d3a73f4 100644 --- a/python/paddle/v2/__init__.py +++ b/python/paddle/v2/__init__.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import os import optimizer import layer import activation @@ -42,6 +43,12 @@ __all__ = [ def init(**kwargs): args = [] + # NOTE: append arguments if they are in ENV + for ek, ev in os.environ.iteritems(): + if ek.startswith("PADDLE_"): + args.append('--%s=%s' % (ek.replace("PADDLE_", "").lower(), str(ev))) + + # NOTE: overwrite arguments from ENV if it is in kwargs for key in kwargs.keys(): args.append('--%s=%s' % (key, str(kwargs[key]))) From 444c4638c21167e138e945f9b91d6afa9a72a63c Mon Sep 17 00:00:00 2001 From: "yi.wu" Date: Fri, 5 May 2017 22:54:50 +0800 Subject: [PATCH 2/3] update for pre-commit --- python/paddle/v2/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/paddle/v2/__init__.py b/python/paddle/v2/__init__.py index 7a9d3a73f4..0942334ca2 100644 --- a/python/paddle/v2/__init__.py +++ b/python/paddle/v2/__init__.py @@ -46,7 +46,8 @@ def init(**kwargs): # NOTE: append arguments if they are in ENV for ek, ev in os.environ.iteritems(): if ek.startswith("PADDLE_"): - args.append('--%s=%s' % (ek.replace("PADDLE_", "").lower(), str(ev))) + args.append('--%s=%s' % (ek.replace("PADDLE_", "").lower(), + str(ev))) # NOTE: overwrite arguments from ENV if it is in kwargs for key in kwargs.keys(): From 950aa8a178aacad6751627d8402063e329966748 Mon Sep 17 00:00:00 2001 From: wuyi05 Date: Tue, 9 May 2017 17:26:57 +0800 Subject: [PATCH 3/3] overwrite env with kwargs --- python/paddle/v2/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python/paddle/v2/__init__.py b/python/paddle/v2/__init__.py index 0942334ca2..70c8ec0baa 100644 --- a/python/paddle/v2/__init__.py +++ b/python/paddle/v2/__init__.py @@ -43,14 +43,15 @@ __all__ = [ def init(**kwargs): args = [] + args_dict = {} # NOTE: append arguments if they are in ENV for ek, ev in os.environ.iteritems(): - if ek.startswith("PADDLE_"): - args.append('--%s=%s' % (ek.replace("PADDLE_", "").lower(), - str(ev))) + if ek.startswith("PADDLE_INIT_"): + args_dict[ek.replace("PADDLE_INIT_", "").lower()] = str(ev) + args_dict.update(kwargs) # NOTE: overwrite arguments from ENV if it is in kwargs - for key in kwargs.keys(): + for key in args_dict.keys(): args.append('--%s=%s' % (key, str(kwargs[key]))) api.initPaddle(*args)