Skip to content

Commit

Permalink
Merge Pull Request trilinos#8454 from trilinos/Trilinos/mperego-patch-2
Browse files Browse the repository at this point in the history
Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Minor fix to SuperLu version used for enum
PR Author: mperego
  • Loading branch information
trilinos-autotester authored Dec 11, 2020
2 parents 4c5776a + 75febde commit 1d57a92
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/amesos2/src/Amesos2_Superlu_def.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ Superlu<Matrix,Vector>::getValidParameters_impl() const
"Use weighted bipartite matching algorithm",
"Use the ordering given in perm_r input"),
tuple<SLU::rowperm_t>(SLU::NOROWPERM,
#if SUPERLU_MAJOR_VERSION > 5 || (SUPERLU_MAJOR_VERSION == 5 && SUPERLU_MINOR_VERSION > 2) || (SUPERLU_MAJOR_VERSION == 5 && SUPERLU_MINOR_VERSION == 2 && SUPERLU_PATCH_VERSION >= 2)
#if SUPERLU_MAJOR_VERSION > 5 || (SUPERLU_MAJOR_VERSION == 5 && SUPERLU_MINOR_VERSION > 2) || (SUPERLU_MAJOR_VERSION == 5 && SUPERLU_MINOR_VERSION == 2 && SUPERLU_PATCH_VERSION >= 1)
SLU::LargeDiag_MC64,
#else
SLU::LargeDiag,
Expand Down

0 comments on commit 1d57a92

Please sign in to comment.