temporarily switch the snapshot_format default back to BINARYPROTO

out of anticipation for user issues due to issue BVLC#2885, which causes Caffe to crash when it attempts to snapshot nets with duplicate layer names
matthiasplappert · Aug 10, 2015 · 40aae84 · 40aae84
1 parent b70f83f
commit 40aae84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto
@@ -179,7 +179,7 @@ message SolverParameter {
     HDF5 = 0;
     BINARYPROTO = 1;
   }
-  optional SnapshotFormat snapshot_format = 37 [default = HDF5];
+  optional SnapshotFormat snapshot_format = 37 [default = BINARYPROTO];
   // the mode solver will use: 0 for CPU and 1 for GPU. Use GPU in default.
   enum SolverMode {
     CPU = 0;

diff --git a/src/caffe/test/test_gradient_based_solver.cpp b/src/caffe/test/test_gradient_based_solver.cpp
@@ -195,7 +195,7 @@ class GradientBasedSolverTest : public MultiDeviceTest<TypeParam> {
     if (snapshot) {
       ostringstream resume_file;
       resume_file << snapshot_prefix_ << "/_iter_" << num_iters
-                  << ".solverstate.h5";
+                  << ".solverstate";
       string resume_filename = resume_file.str();
       return resume_filename;
     }