Back-merge recent fixes from master to dev

fix OSX 10.9 compiler/stdlib override for latest homebrew
follow-up on #443 to invert k channels (instead of 3)
Correctly invert the swapping of colour channels
link presentation on dropbox (was self-hosted during a dropbox issue)
link to demo
fix draw_net python script
release v1 model defs + weights
point out @niuzhiheng's work on the Windows port
fix test_all path in docs
link canonical bvlc site
fix detection notebook link

README.md

@@ -22,7 +22,7 @@ line of code: `Caffe::set_mode(Caffe::CPU)`.
 Even in CPU mode, computing predictions on an image takes only 20 ms when images
 are processed in batch mode.
 
-* [Caffe introductory presentation](http://berkeleyvision.org/caffe-presentation.pdf)
+* [Caffe introductory presentation](https://www.dropbox.com/s/10fx16yp5etb8dv/caffe-presentation.pdf)
 * [Installation instructions](http://caffe.berkeleyvision.org/installation.html)
 
 \* When measured with the [SuperVision](http://www.image-net.org/challenges/LSVRC/2012/supervision.pdf) model that won the ImageNet Large Scale Visual Recognition Challenge 2012.

docs/development.md

@@ -39,14 +39,14 @@ We'd appreciate your contribution to the documentation effort!
 The `googletest` framework we use provides many additional options, which you can access by running the test binaries directly. One of the more useful options is `--gtest_filter`, which allows you to filter tests by name:
 
     # run all tests with CPU in the name
-    build/src/caffe/test/test_all.testbin --gtest_filter='*CPU*'
+    build/test/test_all.testbin --gtest_filter='*CPU*'
 
     # run all tests without GPU in the name (note the leading minus sign)
-    build/src/caffe/test/test_all.testbin --gtest_filter=-'*GPU*'
+    build/test/test_all.testbin --gtest_filter=-'*GPU*'
 
 To get a list of all options `googletest` provides, simply pass the `--help` flag:
 
-    build/src/caffe/test/test_all.testbin --help
+    build/test/test_all.testbin --help
 
 **Style**
 

docs/index.md

@@ -8,6 +8,8 @@ It was created by [Yangqing Jia](http://daggerfs.com), and is in active developm
 
 Caffe is released under [the BSD 2-Clause license](https://github.com/BVLC/caffe/blob/master/LICENSE).
 
+Check out the [classification demo](http://demo.caffe.berkeleyvision.org/)!
+
 <!-- BVLC hosts a quick [classification demo](http://demo.caffe.berkeleyvision.org/) using Caffe. -->
 
 ## Why Caffe?
@@ -23,7 +25,7 @@ Even in CPU mode, computing predictions on an image takes only 20 ms when images
 
 ## Documentation
 
-* [Introductory slides](http://caffe.berkeleyvision.org/caffe-presentation.pdf): slides about the Caffe architecture, *updated 03/14*.
+* [Introductory slides](https://www.dropbox.com/s/10fx16yp5etb8dv/caffe-presentation.pdf): slides about the Caffe architecture, *updated 03/14*.
 * [Installation](/installation.html): Instructions on installing Caffe (works on Ubuntu, Red Hat, OS X).
 * [Pre-trained models](/getting_pretrained_models.html): BVLC provides some pre-trained models for academic / non-commercial use.
 * [Development](/development.html): Guidelines for development and contributing to Caffe.

docs/installation.md

@@ -126,22 +126,30 @@ For each of these formulas, `brew edit FORMULA`, and add the ENV definitions as
 
 ```
     def install
-        #ADD THE FOLLOWING:
-        ENV.append "CXXFLAGS", '-stdlib=libstdc++'
-        ENV.append "CFLAGS", '-stdlib=libstdc++'
-        ENV.append "LDFLAGS", '-stdlib=libstdc++ -lstdc++'
-        #The following is necessary because libtool liks to strip LDFLAGS:
-        ENV.cxx = "/usr/bin/clang -stdlib=libstdc++"
+        # ADD THE FOLLOWING:
+        ENV.append "CXXFLAGS", "-stdlib=libstdc++"
+        ENV.append "CFLAGS", "-stdlib=libstdc++"
+        ENV.append "LDFLAGS", "-stdlib=libstdc++ -lstdc++"
+        # The following is necessary because libtool likes to strip LDFLAGS:
+        ENV["CXX"] = "/usr/bin/clang -stdlib=libstdc++"
         ...
 ```
 
+To edit the formulae in turn, run
+
+    for x in snappy leveldb protobuf gflags glog szip boost homebrew/science/opencv; do brew edit $x; done
+
 After this, run
 
     for x in snappy leveldb protobuf gflags glog szip boost homebrew/science/opencv; do brew uninstall $x; brew install --build-from-source --fresh -vd $x; done
 
 **Note** that the HDF5 dependency is provided by Anaconda Python in this case.
 If you're not using Anaconda, include `hdf5` in the list above.
 
+#### Windows
+
+There is an unofficial Windows port of Caffe at [niuzhiheng/caffe:windows](https://github.com/niuzhiheng/caffe). Thanks [@niuzhiheng](https://github.com/niuzhiheng).
+
 ## Compilation
 
 Now that you have the prerequisites, edit your `Makefile.config` to change the paths for your setup.