remove ProtoData in sample_trainer_config_opt_*.conf

PaddlePaddle · Nov 3, 2017 · ebb22e5 · ebb22e5
1 parent bbeb826
commit ebb22e5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/paddle/trainer/tests/mnist.list b/paddle/trainer/tests/mnist.list
diff --git a/paddle/trainer/tests/mnist_bin_part b/paddle/trainer/tests/mnist_bin_part
diff --git a/paddle/trainer/tests/sample_trainer_config_opt_a.conf b/paddle/trainer/tests/sample_trainer_config_opt_a.conf
@@ -15,12 +15,16 @@
 from paddle.trainer_config_helpers import *
 
 ################################### Data Configuration ###################################
-TrainData(ProtoData(files = "trainer/tests/mnist.list"))
+TrainData(SimpleData(
+            files = "trainer/tests/sample_filelist.txt",
+            feat_dim = 3,
+            context_len = 0,
+            buffer_capacity = 1000000))
 ################################### Algorithm Configuration ###################################
 settings(batch_size = 1000,
          learning_method = MomentumOptimizer(momentum=0.5, sparse=False))
 ################################### Network Configuration ###################################
-data = data_layer(name ="input", size=784)
+data = data_layer(name ="input", size=3)
 
 fc1 = fc_layer(input=data, size=800,
                bias_attr=True,

diff --git a/paddle/trainer/tests/sample_trainer_config_opt_b.conf b/paddle/trainer/tests/sample_trainer_config_opt_b.conf
@@ -15,12 +15,16 @@
 from paddle.trainer_config_helpers import *
 
 ################################### Data Configuration ###################################
-TrainData(ProtoData(files = "trainer/tests/mnist.list"))
+TrainData(SimpleData(
+            files = "trainer/tests/sample_filelist.txt",
+            feat_dim = 3,
+            context_len = 0,
+            buffer_capacity = 1000000))
 ################################### Algorithm Configuration ###################################
 settings(batch_size = 1000,
          learning_method = MomentumOptimizer(momentum=0.5, sparse=False))
 ################################### Network Configuration ###################################
-data = data_layer(name ="input", size=784)
+data = data_layer(name ="input", size=3)
 
 fc1 = fc_layer(input=data, size=800,
                bias_attr=True,