diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2016-08-18 10:42:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 10:42:33 -0700 |
| commit | 4572501a850ce3f102a9b081106c3f0d3ede1e23 (patch) | |
| tree | 987c17b8e167658fa5c304930e604bcb931297ce /include | |
| parent | 904e024861997b62a836cfa967ab366cbfb8a940 (diff) | |
| parent | 5395cc66d68df74ff5d0920ed80eabcdd439c660 (diff) | |
| download | caffeonacl-4572501a850ce3f102a9b081106c3f0d3ede1e23.tar.gz caffeonacl-4572501a850ce3f102a9b081106c3f0d3ede1e23.tar.bz2 caffeonacl-4572501a850ce3f102a9b081106c3f0d3ede1e23.zip | |
Merge pull request #3272 from ixartz/master
[cmake] OSX 10.10 (and more) use Accelerate Framework instead of veclib
Diffstat (limited to 'include')
| -rw-r--r-- | include/caffe/util/mkl_alternate.hpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/caffe/util/mkl_alternate.hpp b/include/caffe/util/mkl_alternate.hpp index 3355b665..95df0f93 100644 --- a/include/caffe/util/mkl_alternate.hpp +++ b/include/caffe/util/mkl_alternate.hpp @@ -7,9 +7,14 @@ #else // If use MKL, simply include the MKL header +#ifdef USE_ACCELERATE +#include <Accelerate/Accelerate.h> +#else extern "C" { #include <cblas.h> } +#endif // USE_ACCELERATE + #include <math.h> // Functions that caffe uses but are not present if MKL is not linked. |