Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support OS X Yosemite / 10.10 #1740

Merged
merged 1 commit into from
Jan 16, 2015
Merged

Conversation

shelhamer
Copy link
Member

CUDA 7 is at last compatible with libc++, so on OS X the installation will be much simpler since the libstdc++ workaround for NVCC compatibility will no longer be needed. Until then, compiling Caffe on OS X Yosemite almost just works, but this takes care of the details:

  • pick libstdc++ for OS X (regardless of version)
  • make gtest rely on its own tuple to not conflict with clang (I'm not sure this is necessary, but it seems to be needed sometimes and does no harm)
  • 10.10 has Accelerate while 10.9 has vecLib for BLAS

Thanks to @leonardt @drdan14 @pluskid scottsievert and others for reporting these issues with fixes.

Note: this PR is to dev because a release will be made soon.

- 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)
@shelhamer
Copy link
Member Author

This still suffers from the PowerGradient test failures #1252 with boost 1.57 (regardless of the BLAS choice).

shelhamer added a commit that referenced this pull request Jan 16, 2015
@shelhamer shelhamer merged commit 51f058f into BVLC:dev Jan 16, 2015
@shelhamer shelhamer deleted the yosemite-makefile branch January 16, 2015 04:49
@pannous
Copy link

pannous commented Jan 16, 2015

Yay, works, but Makefile gets overwritten if people foolishly call cmake

@pannous
Copy link

pannous commented Feb 4, 2015

Until then, compiling Caffe on OS X Yosemite almost just works, but this takes care of the details: pick libstdc++ ...

This should probably be mentioned/referenced/clarified here:
http://caffe.berkeleyvision.org/installation.html

@shelhamer
Copy link
Member Author

Yes -- the installation docs will be overhauled in the next release with a
special section on the CUDA / libc++ situation on Yosemite.
On Wed, Feb 4, 2015 at 03:42 pannous notifications@github.com wrote:

Until then, compiling Caffe on OS X Yosemite almost just works, but
this takes care of the details: pick libstdc++ ...

This should probably be mentioned/referenced/clarified here:
http://caffe.berkeleyvision.org/installation.html


Reply to this email directly or view it on GitHub
#1740 (comment).

@shelhamer
Copy link
Member Author

33a56e0 adds the Makefile condition for Yosemite and CUDA 7 to agree on libc++ so OS X 10.10 users should not switch dependencies to libstdc++.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants