diff options
author | Denis Davydov <davydden@gmail.com> | 2016-03-23 07:09:58 +0100 |
---|---|---|
committer | Denis Davydov <davydden@gmail.com> | 2016-03-25 11:56:39 +0100 |
commit | 18db930866b2024b242ea7c825851d7a56b27247 (patch) | |
tree | a57acdb7f3c7aff50d86d94e904063b85332b37e | |
parent | 76006fc346c7880b03356c1cf9d00bab2fdeac45 (diff) | |
download | spack-18db930866b2024b242ea7c825851d7a56b27247.tar.gz spack-18db930866b2024b242ea7c825851d7a56b27247.tar.bz2 spack-18db930866b2024b242ea7c825851d7a56b27247.tar.xz spack-18db930866b2024b242ea7c825851d7a56b27247.zip |
rearrange
-rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 7d7613d2b5..063d179c7e 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -73,14 +73,6 @@ class Trilinos(Package): '-DTPL_ENABLE_TBB:BOOL=ON' ]) - # Amesos, conflicting types of double and complex SLU_D - # see https://trilinos.org/pipermail/trilinos-users/2015-March/004731.html - # and https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html - options.extend([ - '-DTeuchos_ENABLE_COMPLEX:BOOL=OFF', - '-DKokkosTSQR_ENABLE_Complex:BOOL=OFF' - ]) - # suite-sparse related options.extend([ '-DTPL_ENABLE_Cholmod:BOOL=ON', @@ -113,7 +105,14 @@ class Trilinos(Package): '-DSCALAPACK_LIBRARY_NAMES=scalapack' # FIXME: for MKL it's mkl_scalapack_lp64;mkl_blacs_mpich_lp64 ]) - # superlu_dist + # superlu_dist: + # Amesos, conflicting types of double and complex SLU_D + # see https://trilinos.org/pipermail/trilinos-users/2015-March/004731.html + # and https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html + options.extend([ + '-DTeuchos_ENABLE_COMPLEX:BOOL=OFF', + '-DKokkosTSQR_ENABLE_Complex:BOOL=OFF' + ]) options.extend([ '-DTPL_ENABLE_SuperLUDist:BOOL=ON', '-DSuperLUDist_INCLUDE_DIRS=%s' % spec['superlu-dist'].prefix.include @@ -123,7 +122,6 @@ class Trilinos(Package): '-DHAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG:BOOL=ON' ]) - # disable due to compiler / config errors: options.extend([ '-DTrilinos_ENABLE_SEACAS=OFF', |