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

Fixing octave, so plot(1) works.

Browse Source 
Linking octave with clapack did not work.

I updated lapack, and additionally I build it with atlas, instead of blas. That should give
better performance. I don't know if atlas builds everywhere though.

On the other hand, maybe some programs linking with liblapack will fail. We'll have to check
the hydra reports.

I plan to remove clapack; liblapack provides a C interface too.


svn path=/nixpkgs/trunk/; revision=32464
This commit is contained in:
Lluís Batlle i Rossell
2012-02-21 21:43:44 +00:00
parent 8cb96ff7b2
commit 5e2de19cc1
4 changed files with 16 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/science/math/liblapack/default.nix
+13 -56
View File
@@ -1,66 +1,23 @@
{ stdenv, fetchurl, gfortran, blas }:
{ stdenv, fetchurl, gfortran, atlas, cmake }:
stdenv.mkDerivation {
name = "liblapack-3.2.1";
name = "liblapack-3.4.0";
src = fetchurl {
url = "http://www.netlib.org/lapack/lapack-3.2.1.tgz";
sha256 = "5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d";
url = "http://www.netlib.org/lapack/lapack-3.4.0.tgz";
sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7";
};
buildInputs = [gfortran blas];
patches = [ ./blas-link.patch ];
propagatedBuildInputs = [ atlas ];
buildInputs = [ gfortran cmake ];
configurePhase = ''
echo >make.inc "SHELL = ${stdenv.shell}"
echo >>make.inc "PLAT ="
echo >>make.inc "FORTRAN = gfortran"
echo >>make.inc "OPTS = -O2 -fPIC"
echo >>make.inc "DRVOPTS = \$(OPTS)"
echo >>make.inc "NOOPT = -O0 -fPIC"
echo >>make.inc "LOADER = gfortran"
echo >>make.inc "LOADOPTS ="
echo >>make.inc "TIMER = INT_ETIME"
echo >>make.inc "ARCH = gfortran"
echo >>make.inc "ARCHFLAGS = -shared -o"
echo >>make.inc "RANLIB = echo"
echo >>make.inc "BLASLIB = -lblas"
echo >>make.inc "LAPACKLIB = liblapack.so.3"
echo >>make.inc "TMGLIB = libtmglib.so.3"
echo >>make.inc "EIGSRCLIB = libeigsrc.so.3"
echo >>make.inc "LINSRCLIB = liblinsrc.so.3"
'';
cmakeFlags = [
"-DUSE_OPTIMIZED_BLAS=ON"
"-DBLAS_ATLAS_f77blas_LIBRARY=${atlas}/lib/libf77blas.a"
"-DBLAS_ATLAS_atlas_LIBRARY=${atlas}/lib/libatlas.a"
"-DCMAKE_Fortran_FLAGS=-fPIC"
];
buildPhase = ''
make clean
make lib
echo >make.inc "SHELL = ${stdenv.shell}"
echo >>make.inc "PLAT ="
echo >>make.inc "FORTRAN = gfortran"
echo >>make.inc "OPTS = -O2 -fPIC"
echo >>make.inc "DRVOPTS = \$(OPTS)"
echo >>make.inc "NOOPT = -O0 -fPIC"
echo >>make.inc "LOADER = gfortran"
echo >>make.inc "LOADOPTS = "
echo >>make.inc "TIMER = INT_ETIME"
echo >>make.inc "ARCH = ar rcs"
echo >>make.inc "RANLIB = ranlib"
echo >>make.inc "BLASLIB = "
echo >>make.inc "ARCHFLAGS ="
echo >>make.inc "LAPACKLIB = liblapack.a"
echo >>make.inc "TMGLIB = tmglib.a"
echo >>make.inc "EIGSRCLIB = eigsrc.a"
echo >>make.inc "LINSRCLIB = linsrc.a"
make clean
make lib
'';
installPhase = ''
ensureDir "$out/lib"
install -m755 *.a* "$out/lib"
install -m755 *.so* "$out/lib"
ln -sf liblapack.so.3 "$out/lib/liblapack.so"
ln -sf libtmglib.so.3 "$out/lib/libtmglib.so"
'';
enableParallelBuilding = true;
meta = {
description = "Linear Algebra PACKage";