From 6485be076bdebd2ea311e8a06778a55b72a1d095 Mon Sep 17 00:00:00 2001
From: Jeff Donahue <jeff.donahue@gmail.com>
Date: Tue, 29 Jul 2014 15:59:49 -0700
Subject: [PATCH] Set correct solver_mode in SolverTest so Travis build doesn't
 randomly fail.

---
 src/caffe/test/test_solver.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/caffe/test/test_solver.cpp b/src/caffe/test/test_solver.cpp
index 7380ab8..9e087b0 100644
--- a/src/caffe/test/test_solver.cpp
+++ b/src/caffe/test/test_solver.cpp
@@ -25,6 +25,17 @@ class SolverTest : public MultiDeviceTest<TypeParam> {
   virtual void InitSolverFromProtoString(const string& proto) {
     SolverParameter param;
     CHECK(google::protobuf::TextFormat::ParseFromString(proto, &param));
+    // Set the solver_mode according to current Caffe::mode.
+    switch (Caffe::mode()) {
+      case Caffe::CPU:
+        param.set_solver_mode(SolverParameter_SolverMode_CPU);
+        break;
+      case Caffe::GPU:
+        param.set_solver_mode(SolverParameter_SolverMode_GPU);
+        break;
+      default:
+        LOG(FATAL) << "Unknown Caffe mode: " << Caffe::mode();
+    }
     solver_.reset(new SGDSolver<Dtype>(param));
   }
 
-- 
2.7.4