diff options
| author | Cedric Nugteren <web@cedricnugteren.nl> | 2016-05-04 19:16:09 +0200 |
|---|---|---|
| committer | Cedric Nugteren <web@cedricnugteren.nl> | 2016-05-04 19:16:09 +0200 |
| commit | aa97c836b14b4a449b3bfdf45e62e0588c33bec1 (patch) | |
| tree | 209054b8f6f74b3b6de9cd54a91b28a4970f1c59 | |
| parent | 435729a43ecb3eacb3347ad7cf37f8479680d423 (diff) | |
Fixed an issue with linking against the ATLAS BLAS library
| -rw-r--r-- | cmake/Modules/FindCBLAS.cmake | 4 | ||||
| -rw-r--r-- | scripts/generator/generator.py | 2 | ||||
| -rw-r--r-- | test/wrapper_cblas.h | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cmake/Modules/FindCBLAS.cmake b/cmake/Modules/FindCBLAS.cmake index 86f14515..ef3dc4bc 100644 --- a/cmake/Modules/FindCBLAS.cmake +++ b/cmake/Modules/FindCBLAS.cmake @@ -48,11 +48,11 @@ mark_as_advanced(CBLAS_INCLUDE_DIRS) # Finds the library find_library(CBLAS_LIBRARIES - NAMES blas mkl blis openblas atlas accelerate + NAMES blas cblas mkl blis openblas accelerate HINTS ${CBLAS_HINTS} PATH_SUFFIXES lib lib64 lib/x86_64 lib/x64 lib/x86 lib/Win32 lib/import lib64/import - openblas/lib blis/lib + openblas/lib blis/lib lib/atlas-base PATHS ${CBLAS_PATHS} DOC "Netlib BLAS library" ) diff --git a/scripts/generator/generator.py b/scripts/generator/generator.py index 0fd05053..75c0a093 100644 --- a/scripts/generator/generator.py +++ b/scripts/generator/generator.py @@ -299,7 +299,7 @@ files = [ path_clblast+"/test/wrapper_clblas.h", path_clblast+"/test/wrapper_cblas.h", ] -header_lines = [84, 71, 93, 22, 29, 38] +header_lines = [84, 71, 93, 22, 29, 41] footer_lines = [17, 71, 19, 14, 6, 6] # Checks whether the command-line arguments are valid; exists otherwise diff --git a/test/wrapper_cblas.h b/test/wrapper_cblas.h index 994b48b1..566c90e5 100644 --- a/test/wrapper_cblas.h +++ b/test/wrapper_cblas.h @@ -15,7 +15,10 @@ #ifndef CLBLAST_TEST_WRAPPER_CBLAS_H_ #define CLBLAST_TEST_WRAPPER_CBLAS_H_ -#include <cblas.h> +extern "C" +{ + #include <cblas.h> +} #include "internal/utilities.h" |