diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-01-15 16:28:09 -0800 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-01-15 16:28:09 -0800 |
| commit | ab839f5b2f5c93da34c2ab797ab2a64b62645976 (patch) | |
| tree | 7ce7bd4e4cb02d14a147bb830d2f840a5ec1e124 /docs | |
| parent | 25e37489294cabcc023b3583ad72d8753317e069 (diff) | |
| download | caffeonacl-ab839f5b2f5c93da34c2ab797ab2a64b62645976.tar.gz caffeonacl-ab839f5b2f5c93da34c2ab797ab2a64b62645976.tar.bz2 caffeonacl-ab839f5b2f5c93da34c2ab797ab2a64b62645976.zip | |
support OS X Yosemite / 10.10
- pick libstdc++ for OS X (regardless of version)
- make gtest rely on its own tuple to not conflict with clang
(thanks @pluskid!)
- 10.10 has Accelerate while 10.9 has vecLib for BLAS
(thanks @leonardt and @drdan14)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/installation.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/installation.md b/docs/installation.md index c667cd8c..94068e50 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -5,7 +5,7 @@ title: Installation # Installation Prior to installing, it is best to read through this guide and take note of the details for your platform. -We have installed Caffe on Ubuntu 14.04, Ubuntu 12.04, OS X 10.9, and OS X 10.8. +We have installed Caffe on Ubuntu 14.04, Ubuntu 12.04, OS X 10.10, 10.9, and 10.8. - [Prerequisites](#prerequisites) - [Compilation](#compilation) @@ -156,9 +156,9 @@ Building boost from source is needed to link against your local Python (exceptio **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. -#### 10.9-specific Instructions +#### 10.10- and 10.9-specific Instructions -In OS X 10.9, clang++ is the default C++ compiler and uses `libc++` as the standard library. +In OS X 10.9+, clang++ is the default C++ compiler and uses `libc++` as the standard library. However, NVIDIA CUDA (even version 6.0) currently links only with `libstdc++`. This makes it necessary to change the compilation settings for each of the dependencies. @@ -226,10 +226,10 @@ Then, whenever you want to update homebrew, switch back to the master branches, git checkout master cd /usr/local/Library/Taps/homebrew/homebrew-science git checkout master - + # Update homebrew; hopefully this works without errors! brew update - + # Switch back to the caffe branches with the forumlae that you modified earlier cd /usr/local git rebase master caffe @@ -237,8 +237,8 @@ Then, whenever you want to update homebrew, switch back to the master branches, cd /usr/local/Library/Taps/homebrew/homebrew-science git rebase master caffe # Fix any merge conflicts and commit to caffe branch - - # Done! + + # Done! At this point, you should be running the latest Homebrew packages and your Caffe-related modifications will remain in place. |