renaming

diff --git a/src/caffe/blob.hpp b/src/caffe/blob.hpp
index 32a65662eca85e5c8afc65c2a17ded449176f6b8..7818a05cd498f248153807a76deabb8444cecdb4 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 024f8d738a819ebbdc8f6188bd908330d01e79d7..f4ca5c9ecfa739f38880e705f6fa7f38ec51bba6 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 777fc85664411d4ca3d9bf574a586d142d036be0..551ed3b3c8259fe27e41082aa48cb47bb7c224cf 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 4909d27e6ee856434e31a2a799a1fe1f8cb5e59b..46b55160c11a81791a7d515cccae8b47e8be2081 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 57ce702106e3c9d0b607527cc40eb42698b72106..a080bc266009ccb4af2e7eee2520e70c5c3d7aa0 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 87dffa072c0307b2e2fa1ca696f1f6e19d100082..20032687c1fb8927e191eb6b7eddf7337fa46ab5 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 {