diff options
| author | Roman Grundkiewicz <rgrundki@exseed.ed.ac.uk> | 2020-03-06 00:08:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 00:08:23 +0300 |
| commit | 00d2e999e3c24c9e8c836e800b3720bbe4a326a1 (patch) | |
| tree | da0fdff936ad2b7cc1fb30ea970e2caf4ffe0a41 /cmake | |
| parent | 67b055fe4aad2fbf4a557a6655c4147c6de2f6d3 (diff) | |
Add support for compiling on Mac (and clang) (#598)
* Compile marian on mac and clang. Two linker errors left
* MacOS defines has a different definition for unsigned long
* Find OpenBLAS on mac
* Fix a typo in the BLAS detection
* Simplify and add comments
* Refactor cpu allocation code. Do not fallback to malloc
* Fix compilation warning on gcc
* Refactor memory allocation
* Make things compile with clang-8 with fewer warnings.
* Eliminate clang warnings when compiling examples and when compiling without MKL
* added USE_MKL option to compile without MKL for debugging even when MKL is installed
* fixed issues with compiling examples with clang
* Fix compile errors with clang in src/tests.
* Fix missing whitespace in error message in src/tests/sqlite.cpp.
* Responding to Frank Seide's code review.
* Eliminate clang warnings when compiling with -DUSE_FBGEMM=on.
* Fix compilation on gcc 8
* Get Marian to compile with Clang-10.
* Fix Clang-8 warnings when compiling with marian-server
* Add more comments and explicit unsigned long long for windows
* Pull in fbgemm that supports mac
* Fix warning flags order in CMakeLists.txt
Co-authored-by: Kenneth Heafield <kpu@users.noreply.github.com>
Co-authored-by: Ulrich Germann <ulrich.germann@gmail.com>
Co-authored-by: Roman Grundkiewicz <romang@amu.edu.pl>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindCBLAS.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/FindCBLAS.cmake b/cmake/FindCBLAS.cmake index 631da99b..97b0d3f8 100644 --- a/cmake/FindCBLAS.cmake +++ b/cmake/FindCBLAS.cmake @@ -54,7 +54,7 @@ MACRO(CHECK_ALL_LIBRARIES LIBRARIES INCLUDE _prefix _name _flags _list _include IF(APPLE) FIND_LIBRARY(${_prefix}_${_library}_LIBRARY NAMES ${_library} - PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV + PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 /usr/local/opt/openblas/lib ENV DYLD_LIBRARY_PATH ) ELSE(APPLE) |