Merge pull request BVLC#4 from BVLC/master

updates
puzzledqs · Aug 25, 2014 · 421c6a3 · 421c6a3
2 parents 288412e + 99bea71
commit 421c6a3
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 27 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -66,7 +66,7 @@ Please cite Caffe in your publications if it helps your research:
        Author = {Yangqing Jia},
        Title = { {Caffe}: An Open Source Convolutional Architecture for Fast Feature Embedding},
        Year  = {2013},
-       Howpublished = {\url{http://caffe.berkeleyvision.org/}
+       Howpublished = {\url{http://caffe.berkeleyvision.org/}}
     }
 
 If you do publish a paper where Caffe helped your research, we encourage you to update the [publications wiki](https://github.com/BVLC/caffe/wiki/Publications).

diff --git a/docs/installation.md b/docs/installation.md
@@ -135,7 +135,8 @@ In other `ENV` settings, things may not work as expected.
 Simply run the following:
 
     brew install --build-from-source --with-python boost
-    for x in snappy leveldb protobuf gflags glog szip lmdb homebrew/science/opencv; do brew install $x; done
+    brew install --with-python protobuf
+    for x in snappy leveldb gflags glog szip lmdb homebrew/science/opencv; do brew install $x; done
 
 Building boost from source is needed to link against your local Python (exceptions might be raised during some OS X installs, but **ignore** these and continue). If you do not need the Python wrapper, simply doing `brew install boost` is fine.
 
@@ -172,7 +173,8 @@ To edit the formulae in turn, run
 
 After this, run
 
-    for x in snappy leveldb protobuf gflags glog szip lmdb homebrew/science/opencv; do brew uninstall $x; brew install --build-from-source --fresh -vd $x; done
+    for x in snappy leveldb gflags glog szip lmdb homebrew/science/opencv; do brew uninstall $x; brew install --build-from-source --fresh -vd $x; done
+    brew uninstall protobuf; brew install --build-from-source --with-python --fresh -vd protobuf
     brew install --build-from-source --with-python --fresh -vd boost
 
 **Note** that `brew install --build-from-source --fresh -vd boost` is fine if you do not need the Caffe Python wrapper.

diff --git a/examples/imagenet/imagenet_full_conv.prototxt b/examples/imagenet/imagenet_full_conv.prototxt
@@ -2,8 +2,8 @@ name: "CaffeNetConv"
 input: "data"
 input_dim: 1
 input_dim: 3
-input_dim: 454
-input_dim: 454
+input_dim: 451
+input_dim: 451
 layers {
   name: "conv1"
   type: CONVOLUTION

diff --git a/examples/net_surgery.ipynb b/examples/net_surgery.ipynb
diff --git a/tools/caffe.cpp b/tools/caffe.cpp
@@ -89,6 +89,17 @@ int train() {
 
   LOG(INFO) << "Starting Optimization";
   caffe::SGDSolver<float> solver(solver_param);
+
+  // Set device id and mode
+  if (FLAGS_gpu >= 0) {
+    LOG(INFO) << "Use GPU with device ID " << FLAGS_gpu;
+    Caffe::SetDevice(FLAGS_gpu);
+    Caffe::set_mode(Caffe::GPU);
+  } else if (!solver_param.has_solver_mode()) {
+    LOG(INFO) << "Use CPU.";
+    Caffe::set_mode(Caffe::CPU);
+  }
+
   if (FLAGS_snapshot.size()) {
     LOG(INFO) << "Resuming from " << FLAGS_snapshot;
     solver.Solve(FLAGS_snapshot);