summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py1
-rw-r--r--var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch56
-rw-r--r--var/spack/repos/builtin/packages/xsdk/package.py2
3 files changed, 58 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 3a245e2df3..87a8bf1e91 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -309,6 +309,7 @@ class Trilinos(CMakePackage):
depends_on('py-numpy', when='+python', type=('build', 'run'))
depends_on('swig', when='+python')
+ patch('superlu_dist_v5.4.0.patch', when='@develop')
patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1')
patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl')
patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl_r')
diff --git a/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch b/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch
new file mode 100644
index 0000000000..b094adf944
--- /dev/null
+++ b/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch
@@ -0,0 +1,56 @@
+diff --git a/packages/amesos/src/Amesos_Superludist.cpp b/packages/amesos/src/Amesos_Superludist.cpp
+index f0542faebe..ddca911356 100644
+--- a/packages/amesos/src/Amesos_Superludist.cpp
++++ b/packages/amesos/src/Amesos_Superludist.cpp
+@@ -135,7 +135,7 @@ Amesos_Superludist::Amesos_Superludist(const Epetra_LinearProblem &prob) :
+ Equil_ = true;
+ ColPerm_ = "MMD_AT_PLUS_A";
+ perm_c_ = 0;
+- RowPerm_ = "LargeDiag";
++ RowPerm_ = "LargeDiag_MC64";
+ perm_r_ = 0;
+ IterRefine_ = "DOUBLE";
+ ReplaceTinyPivot_ = true;
+@@ -472,7 +472,7 @@ int Amesos_Superludist::Factor()
+ }
+
+ if( RowPerm_ == "NATURAL" ) PrivateSuperluData_->options_.RowPerm = (rowperm_t)NATURAL;
+- if( RowPerm_ == "LargeDiag" ) PrivateSuperluData_->options_.RowPerm = LargeDiag;
++ if( RowPerm_ == "LargeDiag_MC64" ) PrivateSuperluData_->options_.RowPerm = LargeDiag_MC64;
+ else if( ColPerm_ == "MY_PERMR" ) {
+ PrivateSuperluData_->options_.RowPerm = MY_PERMR;
+ PrivateSuperluData_->ScalePermstruct_.perm_r = perm_r_;
+diff --git a/packages/amesos/test/TestOptions/TestSuperludist.cpp b/packages/amesos/test/TestOptions/TestSuperludist.cpp
+index dc1235f62d..de2ab9459a 100644
+--- a/packages/amesos/test/TestOptions/TestSuperludist.cpp
++++ b/packages/amesos/test/TestOptions/TestSuperludist.cpp
+@@ -35,9 +35,9 @@
+ // 16 false/true false true 2
+ // 17 SamePattern true false true 10
+ // 18 RowPerm - NATURAL true false false 10
+-// 19 RowPerm - LargeDiag true false false 10
++// 19 RowPerm - LargeDiag_MC64 true false false 10
+ // 20 RowPerm - NATURAL true false false 10
+-// 21 RowPerm - LargeDiag true false false 10
++// 21 RowPerm - LargeDiag_MC64 true false false 10
+ // 22 RowPerm - TinyPivot=t true false false 10
+ // 23 RowPerm - TinyPivot=f true false false 10
+ //
+@@ -703,7 +703,7 @@ int TestSuperludist( Epetra_CrsMatrix *& Amat,
+ ParamList.set( "AddZeroToDiag", false );
+ Teuchos::ParameterList& SuperludistParams = ParamList.sublist("Superludist") ;
+ SuperludistParams.set( "ReuseSymbolic", false );
+- SuperludistParams.set( "RowPerm", "LargeDiag" );
++ SuperludistParams.set( "RowPerm", "LargeDiag_MC64" );
+ SuperludistParams.set( "MaxProcesses", 10 );
+ // ParamList.print( std::cerr, 10 ) ;
+
+@@ -772,7 +772,7 @@ int TestSuperludist( Epetra_CrsMatrix *& Amat,
+ ParamList.set( "AddZeroToDiag", false );
+ Teuchos::ParameterList& SuperludistParams = ParamList.sublist("Superludist") ;
+ SuperludistParams.set( "ReuseSymbolic", true );
+- SuperludistParams.set( "RowPerm", "LargeDiag" );
++ SuperludistParams.set( "RowPerm", "LargeDiag_MC64" );
+ SuperludistParams.set( "MaxProcesses", 10 );
+ // ParamList.print( std::cerr, 10 ) ;
+
diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py
index 415fd98c9a..6beee5a307 100644
--- a/var/spack/repos/builtin/packages/xsdk/package.py
+++ b/var/spack/repos/builtin/packages/xsdk/package.py
@@ -61,7 +61,7 @@ class Xsdk(Package):
when='@0.3.0')
depends_on('trilinos@xsdk-0.2.0+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus',
when='@xsdk-0.2.0')
- depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra+nox~ifpack2~zoltan2~amesos2~exodus',
+ depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus',
when='@develop')
depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64',