From ab279beed1725fae4fc4781ba891d80bde8eae0a Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Sun, 5 Feb 2017 01:01:21 +0000 Subject: [PATCH] Remove completely create_data_config_proto --- python/paddle/trainer/config_parser.py | 24 ------------------- .../trainer_config_helpers/data_sources.py | 3 ++- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/python/paddle/trainer/config_parser.py b/python/paddle/trainer/config_parser.py index e3e2a6899..65ebc9613 100644 --- a/python/paddle/trainer/config_parser.py +++ b/python/paddle/trainer/config_parser.py @@ -894,30 +894,6 @@ class MaxOut(Cfg): self.add_keys(locals()) -def create_data_config_proto(async_load_data=False, - constant_slots=None, - data_ratio=1, - is_main_data=True, - usage_ratio=None): - # default: all sub dataproviders are treat as "main data". - # see proto/DataConfig.proto for is_main_data - data_config = DataConfig() - - data_config.async_load_data = async_load_data - - if constant_slots: - data_config.constant_slots.extend(constant_slots) - data_config.data_ratio = data_ratio - data_config.is_main_data = is_main_data - - usage_ratio = default(usage_ratio, settings_deprecated["usage_ratio"]) - config_assert(usage_ratio >= 0 and usage_ratio <= 1, - "The range of usage_ratio is [0, 1]") - data_config.usage_ratio = usage_ratio - - return data_config - - @config_func def SimpleData(files=None, feat_dim=None, diff --git a/python/paddle/trainer_config_helpers/data_sources.py b/python/paddle/trainer_config_helpers/data_sources.py index 0ea8fc77e..6744dec5a 100644 --- a/python/paddle/trainer_config_helpers/data_sources.py +++ b/python/paddle/trainer_config_helpers/data_sources.py @@ -14,6 +14,7 @@ """ Data Sources are helpers to define paddle training data or testing data. """ +import paddle.proto.DataConfig_pb2 from paddle.trainer.config_parser import * from .utils import deprecated @@ -195,7 +196,7 @@ def define_py_data_sources2(train_list, test_list, module, obj, args=None): def py_data2(files, load_data_module, load_data_object, load_data_args, **kwargs): - data = create_data_config_proto() + data = paddle.proto.DataConfig_pb2.DataConfig() data.type = 'py2' data.files = files data.load_data_module = load_data_module -- GitLab