Skip to content

Conversation

@qipeng
Copy link
Contributor

@qipeng qipeng commented Aug 30, 2014

Solves the problem described in #1009 .

@qipeng qipeng force-pushed the boost-thread-with-nvcc branch from 03c9955 to 1a71867 Compare August 30, 2014 18:00
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rename caffe::ThreadWrapper to caffe::Thread.

@shelhamer
Copy link
Member

Thanks for the fix and quick work @qipeng! Much appreciated.

@qipeng qipeng force-pushed the boost-thread-with-nvcc branch from 8faeaec to b036c1d Compare August 30, 2014 23:33
@qipeng
Copy link
Contributor Author

qipeng commented Aug 30, 2014

@shelhamer Please let me know if any further changes are needed! :)

@shelhamer shelhamer merged commit b036c1d into BVLC:dev Aug 30, 2014
shelhamer added a commit that referenced this pull request Aug 30, 2014
Fix boost-CUDA trouble in OS X build.
@shelhamer
Copy link
Member

Merged with slight fix up in 39acda0 plus I adjusted the Makefile for OS X boost::thread in 1193b25.

@qipeng
Copy link
Contributor Author

qipeng commented Aug 31, 2014

Thanks @shelhamer !

mitmul pushed a commit to mitmul/caffe that referenced this pull request Sep 30, 2014
Fix boost-CUDA trouble in OS X build.
RazvanRanca pushed a commit to RazvanRanca/caffe that referenced this pull request Nov 4, 2014
Fix boost-CUDA trouble in OS X build.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants