treewide: use blas and lapack
This makes packages use lapack and blas, which can wrap different BLAS/LAPACK implementations. treewide: cleanup from blas/lapack changes A few issues in the original treewide: - can’t assume blas64 is a bool - unused commented code
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, liblapack, blas }:
|
||||
{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }:
|
||||
|
||||
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0";
|
||||
assert (!blas.is64bit) && (!lapack.is64bit);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-lacaml";
|
||||
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib dune base stdio ];
|
||||
propagatedBuildInputs = [ liblapack blas ] ++
|
||||
propagatedBuildInputs = [ lapack blas ] ++
|
||||
stdenv.lib.optionals stdenv.isDarwin
|
||||
[ darwin.apple_sdk.frameworks.Accelerate ];
|
||||
|
||||
|
||||
@@ -6,11 +6,14 @@
|
||||
, eigen
|
||||
, stdio
|
||||
, stdlib-shims
|
||||
, openblasCompat
|
||||
, openblas, blas, lapack
|
||||
, owl-base
|
||||
, npy
|
||||
}:
|
||||
|
||||
assert (!blas.is64bit) && (!lapack.is64bit);
|
||||
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "owl";
|
||||
|
||||
@@ -19,7 +22,7 @@ buildDunePackage rec {
|
||||
checkInputs = [ alcotest ];
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [
|
||||
eigen stdio stdlib-shims openblasCompat owl-base npy
|
||||
eigen stdio stdlib-shims openblas owl-base npy
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462
|
||||
|
||||
Reference in New Issue
Block a user