diff options
author | Yan Chen <yanchen036@gmail.com> | 2015-09-18 17:02:16 +0800 |
---|---|---|
committer | Yan Chen <yanchen036@gmail.com> | 2015-09-18 17:02:16 +0800 |
commit | f75d594bbec1efab69cdc09c04bed1762aebd0e1 (patch) | |
tree | 2b3e5e575933122ff941df64218da5d82c7a795f | |
parent | 3d12b5d9cb014d2e0df4db1b10250ef298e549b9 (diff) | |
download | caffeonacl-f75d594bbec1efab69cdc09c04bed1762aebd0e1.tar.gz caffeonacl-f75d594bbec1efab69cdc09c04bed1762aebd0e1.tar.bz2 caffeonacl-f75d594bbec1efab69cdc09c04bed1762aebd0e1.zip |
refine format of switch case in solver
-rw-r--r-- | include/caffe/solver.hpp | 14 | ||||
-rw-r--r-- | src/caffe/solver.cpp | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/include/caffe/solver.hpp b/include/caffe/solver.hpp index 8d52785a..2ecf539b 100644 --- a/include/caffe/solver.hpp +++ b/include/caffe/solver.hpp @@ -283,19 +283,19 @@ Solver<Dtype>* GetSolver(const SolverParameter& param) { switch (type) { case SolverParameter_SolverType_SGD: - return new SGDSolver<Dtype>(param); + return new SGDSolver<Dtype>(param); case SolverParameter_SolverType_NESTEROV: - return new NesterovSolver<Dtype>(param); + return new NesterovSolver<Dtype>(param); case SolverParameter_SolverType_ADAGRAD: - return new AdaGradSolver<Dtype>(param); + return new AdaGradSolver<Dtype>(param); case SolverParameter_SolverType_RMSPROP: - return new RMSPropSolver<Dtype>(param); + return new RMSPropSolver<Dtype>(param); case SolverParameter_SolverType_ADADELTA: - return new AdaDeltaSolver<Dtype>(param); + return new AdaDeltaSolver<Dtype>(param); case SolverParameter_SolverType_ADAM: - return new AdamSolver<Dtype>(param); + return new AdamSolver<Dtype>(param); default: - LOG(FATAL) << "Unknown SolverType: " << type; + LOG(FATAL) << "Unknown SolverType: " << type; } return (Solver<Dtype>*) NULL; } diff --git a/src/caffe/solver.cpp b/src/caffe/solver.cpp index 3574ce75..12c13dd8 100644 --- a/src/caffe/solver.cpp +++ b/src/caffe/solver.cpp @@ -422,14 +422,14 @@ void Solver<Dtype>::Snapshot() { CHECK(Caffe::root_solver()); string model_filename; switch (param_.snapshot_format()) { - case caffe::SolverParameter_SnapshotFormat_BINARYPROTO: - model_filename = SnapshotToBinaryProto(); - break; - case caffe::SolverParameter_SnapshotFormat_HDF5: - model_filename = SnapshotToHDF5(); - break; - default: - LOG(FATAL) << "Unsupported snapshot format."; + case caffe::SolverParameter_SnapshotFormat_BINARYPROTO: + model_filename = SnapshotToBinaryProto(); + break; + case caffe::SolverParameter_SnapshotFormat_HDF5: + model_filename = SnapshotToHDF5(); + break; + default: + LOG(FATAL) << "Unsupported snapshot format."; } SnapshotSolverState(model_filename); |