diff options
| author | Satish Balay <balay@mcs.anl.gov> | 2018-10-03 09:52:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 09:52:12 -0500 |
| commit | 297f8537b52dcf80530451fd9c2eb371e3c4fb75 (patch) | |
| tree | 6e74b3b21aae3d761d11650b8ae2d98d9e5dc8cc | |
| parent | 846e2c7ca92adabe697fb84c86df59ba8f68e455 (diff) | |
| download | spack-297f8537b52dcf80530451fd9c2eb371e3c4fb75.tar.gz spack-297f8537b52dcf80530451fd9c2eb371e3c4fb75.tar.bz2 spack-297f8537b52dcf80530451fd9c2eb371e3c4fb75.tar.xz spack-297f8537b52dcf80530451fd9c2eb371e3c4fb75.zip | |
trilinos: superlu_dist patch is now in trilinos develop - so removing it (#9422)
https://github.com/trilinos/Trilinos/pull/3209
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch | 56 |
2 files changed, 0 insertions, 57 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index d43ad7999e..319e4bc977 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -309,7 +309,6 @@ 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 deleted file mode 100644 index b094adf944..0000000000 --- a/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch +++ /dev/null @@ -1,56 +0,0 @@ -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 ) ; - |