Skip to content

fix: HIP build issues #4028

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

Merged
castelletto1 merged 3 commits into from
Apr 15, 2026
+31 −8
Merged

fix: HIP build issues #4028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2484248
Fix HIP build issues
victorapm Apr 11, 2026
7b04fc6
LvArray
victorapm Apr 11, 2026
4b4fd06
Merge branch 'develop' into fix/paludettomag1/hip
castelletto1 Apr 15, 2026
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
14 changes: 7 additions & 7 deletions src/coreComponents/constitutiveDrivers/fluid/multiFluid/PVTDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ void PVTDriver::postInputInitialization()
// Check that the functions exist
FunctionManager & functionManager = FunctionManager::getInstance();
GEOS_ERROR_IF( !functionManager.hasGroup< TableFunction >( m_pressureFunctionName ),
getWrapperDataContext( viewKeyStruct::pressureFunctionString() ) <<
"Pressure function with name '" << m_pressureFunctionName << "' not found" );
GEOS_FMT( "Pressure function with name '{}' not found", m_pressureFunctionName ),
getWrapperDataContext( viewKeyStruct::pressureFunctionString() ) );

GEOS_ERROR_IF( !functionManager.hasGroup< TableFunction >( m_temperatureFunctionName ),
getWrapperDataContext( viewKeyStruct::temperatureFunctionString() ) <<
"Temperature function with name '" << m_temperatureFunctionName << "' not found" );
GEOS_FMT( "Temperature function with name '{}' not found", m_temperatureFunctionName ),
getWrapperDataContext( viewKeyStruct::temperatureFunctionString() ) );

// get number of phases and components
MultiFluidBase & baseFluid = getFluid();
Expand All @@ -105,9 +105,9 @@ void PVTDriver::postInputInitialization()
m_numComponents = baseFluid.numFluidComponents();

GEOS_ERROR_IF( m_feed.size() != m_numComponents,
getWrapperDataContext( viewKeyStruct::feedString() ) <<
"Feed must have the same number of components as the fluid. "
"Feed has " << m_feed.size() << " and fluid has " << m_numComponents );
GEOS_FMT( "Feed must have the same number of components as the fluid. Feed has {} and fluid has {}",
m_feed.size(), m_numComponents ),
getWrapperDataContext( viewKeyStruct::feedString() ) );

string_array columnNames;
getColumnNames( columnNames );
Expand Down
25 changes: 24 additions & 1 deletion src/coreComponents/linearAlgebra/interfaces/hypre/HypreKernels.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,29 @@ namespace hypre

/// @cond DO_NOT_DOCUMENT

namespace internal
{

struct ZeroRowSumMessage
{
long long row;
};

inline std::ostream & operator<<( std::ostream & os, ZeroRowSumMessage const & msg )
{
return os << "Zero row sum in row " << msg.row;
}

GEOS_HOST_DEVICE inline ZeroRowSumMessage zeroRowSumMessage( globalIndex const row )
{
#if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
printf( "***** Zero row sum in row %lld\n", static_cast< long long >( row ) );
#endif
return { static_cast< long long >( row ) };
}

} // namespace internal

template< bool CONST >
struct CSRData
{
Expand Down Expand Up @@ -103,7 +126,7 @@ void rescaleMatrixRows( hypre_ParCSRMatrix * const mat,
}
}

GEOS_ASSERT_MSG( !isZero( scale ), GEOS_FMT( "Zero row sum in row {}", rowIndices[i] ) );
GEOS_ASSERT_MSG( !isZero( scale ), internal::zeroRowSumMessage( rowIndices[i] ) );
scale = 1.0 / scale;
for( HYPRE_Int k = diag.rowptr[localRow]; k < diag.rowptr[localRow + 1]; ++k )
{
Expand Down
Loading