BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sundials: assert that lapack and blas are compatible

Browse source 
Instead of asserting that lapack and blas are both not using 64 bit
index size, only make sure they are index size compatible. Plus, do it
when evaluating buildInputs, per:
https://github.com/NixOS/nixpkgs/pull/94892#discussion_r471110250

Don't pass SUNDIALS_INDEX_TYPE=int32_t if blas && lapack are compiled
with 64 bit index size.

Bonus: Use checkTarget and not an overrided checkPhase, per:
https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/explicit-phases.md
This commit is contained in:
Doron Behar 2020-09-23 00:41:47 +03:00
parent aa27e2f238
commit 16a01272ee
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/libraries/sundials/default.nix
View file

@ -7,9 +7,8 @@
, gfortran
, suitesparse
, lapackSupport ? true
, kluSupport ? true }:
assert (!blas.isILP64) && (!lapack.isILP64);
, kluSupport ? true
}:
stdenv.mkDerivation rec {
pname = "sundials";
@ -17,11 +16,14 @@ stdenv.mkDerivation rec {
buildInputs = [
python
] ++ stdenv.lib.optionals (lapackSupport) [
gfortran
blas
lapack
]
++ stdenv.lib.optionals (lapackSupport)
# Check that the same index size is used for both libraries
(assert (blas.isILP64 == lapack.isILP64); [
gfortran
blas
lapack
])
# KLU support is based on Suitesparse.
# It is tested upstream according to the section 1.1.4 of
# [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf)
@ -47,17 +49,22 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
] ++ stdenv.lib.optionals (lapackSupport) [
"-DSUNDIALS_INDEX_TYPE=int32_t"
"-DLAPACK_ENABLE=ON"
"-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
] ++ stdenv.lib.optionals (kluSupport) [
"-DKLU_ENABLE=ON"
"-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
"-DKLU_LIBRARY_DIR=${suitesparse}/lib"
];
] ++ stdenv.lib.optionals (lapackSupport && !lapack.isILP64) [
# Use the correct index type according to lapack which is supposed to be
# the same index type compatible with blas, thanks to the assertion of
# buildInputs
"-DSUNDIALS_INDEX_TYPE=int32_t"
]
;
doCheck = true;
checkPhase = "make test";
checkTarget = "test";
meta = with stdenv.lib; {
description = "Suite of nonlinear differential/algebraic equation solvers";