Skip to content

Commit

Permalink
Merge branch 'snapshot_on_signal' of https://github.com/jyegerlehner/…
Browse files Browse the repository at this point in the history
…caffe into snapshot_on_signal

Conflicts:
	include/caffe/solver.hpp
	src/caffe/solver.cpp
  • Loading branch information
jyegerlehner committed May 18, 2015
2 parents d68b1fe + c0df909 commit 32c4a7b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/caffe/solver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ void Solver<Dtype>::Step(int iters) {
vector<Dtype> losses;
Dtype smoothed_loss = 0;

while (iter_ < stop_iter) {
while (iter_ < stop_iter) {
if (param_.test_interval() && iter_ % param_.test_interval() == 0
&& (iter_ > 0 || param_.test_initialization())) {
TestAll();
Expand Down

0 comments on commit 32c4a7b

Please sign in to comment.