Skip to content

feat: resolve hypredriveInputFile path relative to XML file directory #4038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bd713 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: resolve hypredriveInputFile path relative to XML file directory #4038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/coreComponents/linearAlgebra/unitTests/testHypredrive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ TEST( HypredriveYaml, UsesAuthoritativeFileWhenProvided )
LinearSolverParameters params;
params.solverType = LinearSolverParameters::SolverType::direct;
params.preconditionerType = LinearSolverParameters::PreconditionerType::none;
params.hypredriveInputFile = authoritativeFile;
params.hypredriveInputFile = Path( authoritativeFile.c_str() );

hypre::hypredrive::InputArgsParseTarget target;
ASSERT_TRUE( hypre::hypredrive::buildInputArgsParseTarget( params, target ) );
Expand Down Expand Up @@ -455,7 +455,7 @@ TEST( HypredriveLogging, PrintsStatisticsSummaryWhenHandleIsDestroyed )
}

LinearSolverParameters params;
params.hypredriveInputFile = authoritativeFile;
params.hypredriveInputFile = Path( authoritativeFile.c_str() );

HypreMatrix matrix;
testing::computeIdentity( MPI_COMM_GEOS, 4, matrix );
Expand Down Expand Up @@ -599,7 +599,7 @@ TEST( HypredriveSolverReuse, RecreatesHandleWhenAuthoritativeYamlChanges )
}

LinearSolverParameters params;
params.hypredriveInputFile = authoritativeFile;
params.hypredriveInputFile = Path( authoritativeFile.c_str() );

HypreMatrix matrix;
testing::computeIdentity( MPI_COMM_GEOS, 4, matrix );
Expand Down
2 changes: 1 addition & 1 deletion src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ struct LinearSolverParameters

SolverType solverType = SolverType::direct; ///< Solver type
PreconditionerType preconditionerType = PreconditionerType::iluk; ///< Preconditioner type
string hypredriveInputFile; ///< Optional authoritative hypredrive YAML file
Path hypredriveInputFile; ///< Optional authoritative hypredrive YAML file

/// Direct solver parameters: used for SuperLU_Dist interface through hypre and PETSc
struct Direct
Expand Down
2 changes: 1 addition & 1 deletion src/coreComponents/physicsSolvers/LinearSolverParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ void LinearSolverParametersInput::print() const
tableData.addRow( "Preconditioner type", m_parameters.preconditionerType );
if( !m_parameters.hypredriveInputFile.empty() )
{
tableData.addRow( "hypredrive input file", m_parameters.hypredriveInputFile );
tableData.addRow( "hypredrive input file", string_view( m_parameters.hypredriveInputFile ) );
}
tableData.addRow( "Stop if error", m_parameters.stopIfError );
if( m_parameters.solverType == LinearSolverParameters::SolverType::direct )
Expand Down
Loading