update io-protobuff

unsky · Aug 7, 2018 · 147e52b · 147e52b
1 parent 0f0ca7b
commit 147e52b
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 188 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build/CMakeFiles/sita.dir/src/sita/dataprovider/mnist_dataprovider.cpp.o b/build/CMakeFiles/sita.dir/src/sita/dataprovider/mnist_dataprovider.cpp.o
diff --git a/build/CMakeFiles/sita.dir/src/sita/dlflow/graph.cpp.o b/build/CMakeFiles/sita.dir/src/sita/dlflow/graph.cpp.o
diff --git a/build/CMakeFiles/sita.dir/src/sita/io_protobuff.cpp.o b/build/CMakeFiles/sita.dir/src/sita/io_protobuff.cpp.o
diff --git a/build/sita b/build/sita
diff --git a/include/sita/io_protobuff.h b/include/sita/io_protobuff.h
@@ -27,7 +27,9 @@ namespace sita{
  using google::protobuf::io::ZeroCopyOutputStream;
  using google::protobuf::io::CodedOutputStream;
  using google::protobuf::Message;
- bool ReadProtoFromTextFile(const char* filename, Message* proto);
+
+ bool read_proto_from_txt(const char* filename, Message* proto);
+
 }
 
 #endif //SITA_IO_PROTOBUFF_H
diff --git a/src/sita/dlflow/graph.cpp b/src/sita/dlflow/graph.cpp
@@ -5,7 +5,7 @@
 namespace sita{
 
 Graph::Graph(std::string model_file){
- CHECK(ReadProtoFromTextFile(model_file.c_str(), &_graph))
+ CHECK(read_proto_from_txt(model_file.c_str(), &_graph))
  << "Failed to parse SolverParameter file: " << model_file;
 }
 

diff --git a/src/sita/io_protobuff.cpp b/src/sita/io_protobuff.cpp
@@ -6,7 +6,7 @@
 
 namespace sita{
 
- bool ReadProtoFromTextFile(const char* filename, Message* proto) {
+ bool read_proto_from_txt(const char* filename, Message* proto) {
  int fd = open(filename, O_RDONLY);
  CHECK_NE(fd, -1) << "File not found: " << filename;
  FileInputStream* input = new FileInputStream(fd);