summaryrefslogtreecommitdiff
path: root/docs/installation.md
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2014-08-21 10:10:40 -0700
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2014-08-21 10:10:40 -0700
commit43142a0e7a3c890b205d5fdc03f4e0c047c524ec (patch)
treef561c004249b1a76e74e0dd564c87881cf209d7a /docs/installation.md
parentaee9cd39d6c37e492f6feb638eef118d79bf46b9 (diff)
parent5e8e19b1387de73c1de01b80a052c71c4195b317 (diff)
downloadcaffeonacl-43142a0e7a3c890b205d5fdc03f4e0c047c524ec.tar.gz
caffeonacl-43142a0e7a3c890b205d5fdc03f4e0c047c524ec.tar.bz2
caffeonacl-43142a0e7a3c890b205d5fdc03f4e0c047c524ec.zip
Merge pull request #942 from yosinski/doc-update
protobuf should be installed with Python support on Mac
Diffstat (limited to 'docs/installation.md')
-rw-r--r--docs/installation.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/installation.md b/docs/installation.md
index c2bd64d8..f9731f8f 100644
--- 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.