renaming

diff --git a/src/caffe/blob.hpp b/src/caffe/blob.hpp
index 32a6566..7818a05 100644 (file)
--- a/src/caffe/blob.hpp
+++ b/src/caffe/blob.hpp
@@ -5,7 +5,7 @@
 
 #include "caffe/common.hpp"
 #include "caffe/syncedmem.hpp"
-#include "caffe/proto/layer_param.pb.h"
+#include "caffe/proto/caffe.pb.h"
 
 namespace caffe {
 

diff --git a/src/caffe/filler.hpp b/src/caffe/filler.hpp
index 024f8d7..f4ca5c9 100644 (file)
--- a/src/caffe/filler.hpp
+++ b/src/caffe/filler.hpp
@@ -14,7 +14,7 @@
 #include "caffe/blob.hpp"
 #include "caffe/syncedmem.hpp"
 #include "caffe/util/math_functions.hpp"
-#include "caffe/proto/layer_param.pb.h"
+#include "caffe/proto/caffe.pb.h"
 
 namespace caffe {
 

diff --git a/src/caffe/layer.hpp b/src/caffe/layer.hpp
index 777fc85..551ed3b 100644 (file)
--- a/src/caffe/layer.hpp
+++ b/src/caffe/layer.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 #include "caffe/blob.hpp"
 #include "caffe/common.hpp"
-#include "caffe/proto/layer_param.pb.h"
+#include "caffe/proto/caffe.pb.h"
 
 using std::vector;
 

diff --git a/src/caffe/layer_factory.hpp b/src/caffe/layer_factory.hpp
index 4909d27..46b5516 100644 (file)
--- a/src/caffe/layer_factory.hpp
+++ b/src/caffe/layer_factory.hpp
@@ -7,7 +7,7 @@
 
 #include "caffe/layer.hpp"
 #include "caffe/vision_layers.hpp"
-#include "caffe/proto/layer_param.pb.h"
+#include "caffe/proto/caffe.pb.h"
 
 
 namespace caffe {

diff --git a/src/caffe/proto/layer_param.proto b/src/caffe/proto/caffe.proto
similarity index 100%
rename from src/caffe/proto/layer_param.proto
rename to src/caffe/proto/caffe.proto

diff --git a/src/caffe/test/test_data_layer.cpp b/src/caffe/test/test_data_layer.cpp
index 57ce702..a080bc2 100644 (file)
--- a/src/caffe/test/test_data_layer.cpp
+++ b/src/caffe/test/test_data_layer.cpp
@@ -9,7 +9,7 @@
 #include "caffe/common.hpp"
 #include "caffe/filler.hpp"
 #include "caffe/vision_layers.hpp"
-#include "caffe/proto/layer_param.pb.h"
+#include "caffe/proto/caffe.pb.h"
 #include "caffe/test/test_caffe_main.hpp"
 
 namespace caffe {

diff --git a/src/caffe/test/test_protobuf.cpp b/src/caffe/test/test_protobuf.cpp
index 87dffa0..2003268 100644 (file)
--- a/src/caffe/test/test_protobuf.cpp
+++ b/src/caffe/test/test_protobuf.cpp
@@ -7,7 +7,7 @@
 #include <google/protobuf/text_format.h>
 #include "gtest/gtest.h"
 #include "caffe/test/test_caffe_main.hpp"
-#include "caffe/proto/layer_param.pb.h"
+#include "caffe/proto/caffe.pb.h"
 
 namespace caffe {