a bunch of updates.

[jacinto-ai/caffe-jacinto.git] / src / caffe / test / test_net_proto.cpp

diff --git a/src/caffe/test/test_net_proto.cpp b/src/caffe/test/test_net_proto.cpp
index b2403460138de4aae6e629eb3fcd0b42f813f695..cd16ed659091ee5fbb75a95b94fc4045f97b63da 100644 (file)
--- a/src/caffe/test/test_net_proto.cpp
+++ b/src/caffe/test/test_net_proto.cpp
@@ -39,8 +39,7 @@ TYPED_TEST(NetProtoTest, TestSetup) {
       lenet_string, &net_param));
   // check if things are right
   EXPECT_EQ(net_param.layers_size(), 9);
-  EXPECT_EQ(net_param.bottom_size(), 2);
-  EXPECT_EQ(net_param.top_size(), 0);
+  EXPECT_EQ(net_param.input_size(), 2);
 
   // Now, initialize a network using the parameter
   shared_ptr<Blob<TypeParam> > data(new Blob<TypeParam>(10, 1, 28, 28));
@@ -71,7 +70,7 @@ TYPED_TEST(NetProtoTest, TestSetup) {
   // Run the network without training.
   vector<Blob<TypeParam>*> top_vec;
   LOG(ERROR) << "Performing Forward";
-  caffe_net.Forward(bottom_vec, &top_vec);
+  caffe_net.Forward(bottom_vec);
   LOG(ERROR) << "Performing Backward";
   LOG(ERROR) << caffe_net.Backward();
 }