temporarily switch the snapshot_format default back to BINARYPROTO

out of anticipation for user issues due to issue #2885, which causes
Caffe to crash when it attempts to snapshot nets with duplicate layer
names

diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto
index 96e975b..a13c0e7 100644 (file)
--- 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
index e1bbbf1..7bb0ec1 100644 (file)
--- a/src/caffe/test/test_gradient_based_solver.cpp
+++ b/src/caffe/test/test_gradient_based_solver.cpp
@@ -192,7 +192,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;
     }