support first test run with an iteration offset: test_offset

intel · Nov 6, 2018 · 27aa7f7 · 27aa7f7
1 parent 4998107
commit 27aa7f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto
@@ -262,7 +262,7 @@ message SolverBatchSizePair {
 // NOTE
 // Update the next available ID when you add a new SolverParameter field.
 //
-// SolverParameter next available ID: 52 (last added: local_gw_ratio)
+// SolverParameter next available ID: 53 (last added: test_offset)
 message SolverParameter {
   //////////////////////////////////////////////////////////////////////////////
   // Specifying the train and test networks
@@ -430,6 +430,9 @@ message SolverParameter {
 
   optional bool local_lr_auto = 50 [default = false];
   optional float local_gw_ratio = 51 [default = 0.001];
+
+  // Number of iterations before starting the first test run
+  optional int32 test_offset = 52 [default = 0];
 }
 
 // A message that stores the solver snapshots

diff --git a/src/caffe/solver.cpp b/src/caffe/solver.cpp
@@ -282,7 +282,7 @@ void Solver<Dtype>::Step(int iters) {
   smoothed_loss_ = 0;
 
   while (iter_ < stop_iter) {
-    if (param_.test_interval() && iter_ % param_.test_interval() == 0
+    if (param_.test_interval() && (iter_ - param_.test_offset()) % param_.test_interval() == 0
         && (iter_ > 0 || param_.test_initialization())
         && Caffe::root_solver()) {
       TestAll();
@@ -437,7 +437,7 @@ void Solver<Dtype>::Solve(const char* resume_file) {
   }
 
   // in multinode last test must be done after weights update
-  if (param_.test_interval() && iter_ % param_.test_interval() == 0)
+  if (param_.test_interval() && (iter_ - param_.test_offset()) % param_.test_interval() == 0)
     TestAll();
 
   LOG(INFO) << "Optimization Done.";