hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trilinos: superlu_dist patch is now in trilinos develop - so removing it (#9422)

Browse source 
https://github.com/trilinos/Trilinos/pull/3209
This commit is contained in:
Satish Balay 2018-10-03 09:52:12 -05:00 committed by GitHub
parent 846e2c7ca9
commit 297f8537b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
var/spack/repos/builtin/packages/trilinos/package.py
View file

@ -309,7 +309,6 @@ class Trilinos(CMakePackage):
depends_on('py-numpy', when='+python', type=('build', 'run')) depends_on('py-numpy', when='+python', type=('build', 'run'))
depends_on('swig', when='+python') 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('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')
patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl_r') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl_r')

56
var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch
View file

@ -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 ) ;