public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

armadillo: Force OpenBLAS as LAPACK

Browse Source 
This was accidentally removed during the last commit. It is still
necessary for armadillo to correctly use OpenBLAS as LAPACK!
This commit is contained in:
Josef Kemetmueller 2016-08-16 19:09:41 +02:00
parent 0fbb00e6c3
commit b8b73f34fb
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/armadillo/default.nix
View File

@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DDETECT_HDF5=ON" ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ];
patches = [ ./use-unix-config-on-OS-X.patch ]; patches = [ ./use-unix-config-on-OS-X.patch
./use-OpenBLAS-as-LAPACK.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "C++ linear algebra library"; description = "C++ linear algebra library";

14
pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/cmake_aux/Modules/ARMA_FindLAPACK.cmake b/cmake_aux/Modules/ARMA_FindLAPACK.cmake
index 5395afb..a203c93 100644
--- a/cmake_aux/Modules/ARMA_FindLAPACK.cmake
+++ b/cmake_aux/Modules/ARMA_FindLAPACK.cmake
@@ -5,7 +5,7 @@
# also defined, but not for general use are
# LAPACK_LIBRARY, where to find the LAPACK library.
-SET(LAPACK_NAMES ${LAPACK_NAMES} lapack)
+SET(LAPACK_NAMES ${LAPACK_NAMES} openblas)
FIND_LIBRARY(LAPACK_LIBRARY
NAMES ${LAPACK_NAMES}
PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib