Skip to content

Check if CPU_ONLY is set when determining CUDA version#2224

Merged
shelhamer merged 1 commit intoBVLC:masterfrom
small-yellow-duck:master
Mar 31, 2015
Merged

Check if CPU_ONLY is set when determining CUDA version#2224
shelhamer merged 1 commit intoBVLC:masterfrom
small-yellow-duck:master

Conversation

@small-yellow-duck
Copy link
Copy Markdown
Contributor

Previously, CUDA_VERSION would appear to be < 7 if there was no CUDA
installed, and that would generate the wrong C++ flags for compiling on
recent OSX versions. Instead, skip the CUDA version check if CPU_ONLY is
set. This change only affects CPU_ONLY installations.

Previously, CUDA_VERSION would appear to be < 7 if there was no CUDA
installed, and that would generate the wrong C++ flags for compiling on
recent OSX versions. Instead, skip the CUDA version check if CPU_ONLY is
set. This change only affects CPU_ONLY installations.
@shelhamer
Copy link
Copy Markdown
Member

Thanks for catching this!

shelhamer added a commit that referenced this pull request Mar 31, 2015
[build] check if CPU_ONLY is set when determining CUDA version
@shelhamer shelhamer merged commit 2a7fe03 into BVLC:master Mar 31, 2015
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