From 70d9d953e60992fc0cf7c1a58936452fb3e76b06 Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Mon, 23 Oct 2017 11:36:01 +0800 Subject: [PATCH] rename sparse_vector to sparse_float_vector in tests --- paddle/gserver/tests/test_PyDataProvider2.py | 5 ++++- python/paddle/trainer/PyDataProvider2.py | 8 ++++---- python/paddle/v2/tests/test_data_feeder.py | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/paddle/gserver/tests/test_PyDataProvider2.py b/paddle/gserver/tests/test_PyDataProvider2.py index 2e6225519f..0d0fe476ff 100644 --- a/paddle/gserver/tests/test_PyDataProvider2.py +++ b/paddle/gserver/tests/test_PyDataProvider2.py @@ -51,7 +51,10 @@ def test_sparse_non_value_no_seq(setting, filename): yield [(i + 1) * (j + 1) for j in xrange(10)] -@provider(input_types=[sparse_vector(30000, seq_type=SequenceType.NO_SEQUENCE)]) +@provider(input_types=[ + sparse_float_vector( + 30000, seq_type=SequenceType.NO_SEQUENCE) +]) def test_sparse_value_no_seq(setting, filename): for i in xrange(200): yield [((i + 1) * (j + 1), float(j) / float(i + 1)) for j in xrange(10)] diff --git a/python/paddle/trainer/PyDataProvider2.py b/python/paddle/trainer/PyDataProvider2.py index 045e3c0279..05635833bf 100644 --- a/python/paddle/trainer/PyDataProvider2.py +++ b/python/paddle/trainer/PyDataProvider2.py @@ -216,7 +216,7 @@ def sparse_binary_vector_sub_sequence(dim): return sparse_binary_vector(dim, seq_type=SequenceType.SUB_SEQUENCE) -def sparse_vector_sequence(dim): +def sparse_float_vector_sequence(dim): """ Data type of a sequence of sparse vector, which most elements are zero, others could be any float value. @@ -226,11 +226,11 @@ def sparse_vector_sequence(dim): :return: An input type object :rtype: InputType """ - return sparse_vector(dim, seq_type=SequenceType.SEQUENCE) + return sparse_float_vector(dim, seq_type=SequenceType.SEQUENCE) -def sparse_vector_sub_sequence(dim): - return sparse_vector(dim, seq_type=SequenceType.SUB_SEQUENCE) +def sparse_float_vector_sub_sequence(dim): + return sparse_float_vector(dim, seq_type=SequenceType.SUB_SEQUENCE) def integer_value_sequence(value_range): diff --git a/python/paddle/v2/tests/test_data_feeder.py b/python/paddle/v2/tests/test_data_feeder.py index 83da678da3..63905c04cf 100644 --- a/python/paddle/v2/tests/test_data_feeder.py +++ b/python/paddle/v2/tests/test_data_feeder.py @@ -97,7 +97,7 @@ class DataFeederTest(unittest.TestCase): each_sample.append(zip(a, b)) data.append(each_sample) - feeder = DataFeeder([('input', data_type.sparse_vector(dim))], + feeder = DataFeeder([('input', data_type.sparse_float_vector(dim))], {'input': 0}) arg = feeder(data) output = arg.getSlotValue(0) -- GitLab