From 3e8f232e126e06f6a5266307aada8b1d8e1bac43 Mon Sep 17 00:00:00 2001 From: qiaolongfei Date: Tue, 21 Feb 2017 16:19:42 +0800 Subject: [PATCH 1/2] remove import . to enable run v2/layer.py directly --- python/paddle/v2/__init__.py | 2 +- python/paddle/v2/layer.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python/paddle/v2/__init__.py b/python/paddle/v2/__init__.py index c0a2bdc425..30d0b2a398 100644 --- a/python/paddle/v2/__init__.py +++ b/python/paddle/v2/__init__.py @@ -22,7 +22,7 @@ import py_paddle.swig_paddle as api __all__ = [ 'optimizer', 'layer', 'activation', 'parameters', 'init', 'trainer', - 'event', 'data_type.py' + 'event', 'data_type' ] diff --git a/python/paddle/v2/layer.py b/python/paddle/v2/layer.py index 4d052c983c..9e999fccad 100644 --- a/python/paddle/v2/layer.py +++ b/python/paddle/v2/layer.py @@ -67,7 +67,7 @@ paddle.v2.parameters.create, no longer exposed to users. """ import paddle.trainer_config_helpers as conf_helps -from . import data_type as v2_data +import data_type as data_type from paddle.trainer_config_helpers.config_parser_utils import \ parse_network_config as __parse__ from paddle.trainer_config_helpers.default_decorators import wrap_name_default @@ -166,7 +166,7 @@ So we also need to implement some special LayerV2. class DataLayerV2(Layer): def __init__(self, name, type, **kwargs): - assert isinstance(type, v2_data.InputType) + assert isinstance(type, data_type.InputType) self.type = type self.__method_name__ = 'data_layer' @@ -198,8 +198,8 @@ cross_entropy_cost = __convert_to_v2__( parent_names=['input', 'label']) if __name__ == '__main__': - pixel = data(name='pixel', type=v2_data.dense_vector(784)) - label = data(name='label', type=v2_data.integer_value(10)) + pixel = data(name='pixel', type=data_type.dense_vector(784)) + label = data(name='label', type=data_type.integer_value(10)) hidden = fc(input=pixel, size=100, act=conf_helps.SigmoidActivation()) inference = fc(input=hidden, size=10, act=conf_helps.SoftmaxActivation()) maxid = max_id(input=inference) From e4af5b9228feca57c31ac1bdfacf93cfab6ba217 Mon Sep 17 00:00:00 2001 From: qiaolongfei Date: Tue, 21 Feb 2017 16:23:19 +0800 Subject: [PATCH 2/2] optimize code --- python/paddle/v2/layer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/paddle/v2/layer.py b/python/paddle/v2/layer.py index 9e999fccad..507725ee4f 100644 --- a/python/paddle/v2/layer.py +++ b/python/paddle/v2/layer.py @@ -66,12 +66,14 @@ Also, the creation of a protobuf message is hidden in the invocation of paddle.v2.parameters.create, no longer exposed to users. """ +import collections + import paddle.trainer_config_helpers as conf_helps -import data_type as data_type from paddle.trainer_config_helpers.config_parser_utils import \ parse_network_config as __parse__ from paddle.trainer_config_helpers.default_decorators import wrap_name_default -import collections + +import data_type __all__ = [ 'parse_network', 'data', 'fc', 'max_id', 'classification_cost',