OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed OpenCL dependencies from rocsparse backend

Browse Source
This commit is contained in:
Justin Chang 2023-09-28 00:22:18 -05:00
parent d1b908421d
commit 54d82d349e
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ebos/eclbasevanguard.hh
View File

@ -92,12 +92,12 @@ struct EdgeWeightsMethod {
using type = UndefinedProperty; using type = UndefinedProperty;
}; };
#if HAVE_OPENCL #if HAVE_OPENCL || HAVE_ROCSPARSE
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct NumJacobiBlocks { struct NumJacobiBlocks {
using type = UndefinedProperty; using type = UndefinedProperty;
}; };
#endif // HAVE_OPENCL #endif // HAVE_OPENCL || HAVE_ROCSPARSE
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct OwnerCellsFirst { struct OwnerCellsFirst {
@ -153,12 +153,12 @@ struct EdgeWeightsMethod<TypeTag, TTag::EclBaseVanguard> {
static constexpr int value = 1; static constexpr int value = 1;
}; };
#if HAVE_OPENCL #if HAVE_OPENCL || HAVE_ROCSPARSE
template<class TypeTag> template<class TypeTag>
struct NumJacobiBlocks<TypeTag, TTag::EclBaseVanguard> { struct NumJacobiBlocks<TypeTag, TTag::EclBaseVanguard> {
static constexpr int value = 0; static constexpr int value = 0;
}; };
#endif // HAVE_OPENCL #endif // HAVE_OPENCL || HAVE_ROCSPARSE
template<class TypeTag> template<class TypeTag>
struct OwnerCellsFirst<TypeTag, TTag::EclBaseVanguard> { struct OwnerCellsFirst<TypeTag, TTag::EclBaseVanguard> {
@ -248,7 +248,7 @@ public:
EWOMS_REGISTER_PARAM(TypeTag, int, EdgeWeightsMethod, EWOMS_REGISTER_PARAM(TypeTag, int, EdgeWeightsMethod,
"Choose edge-weighing strategy: 0=uniform, 1=trans, 2=log(trans)."); "Choose edge-weighing strategy: 0=uniform, 1=trans, 2=log(trans).");
#if HAVE_OPENCL #if HAVE_OPENCL || HAVE_ROCSPARSE
EWOMS_REGISTER_PARAM(TypeTag, int, NumJacobiBlocks, EWOMS_REGISTER_PARAM(TypeTag, int, NumJacobiBlocks,
"Number of blocks to be created for the Block-Jacobi preconditioner."); "Number of blocks to be created for the Block-Jacobi preconditioner.");
#endif #endif
@ -288,7 +288,7 @@ public:
fileName_ = EWOMS_GET_PARAM(TypeTag, std::string, EclDeckFileName); fileName_ = EWOMS_GET_PARAM(TypeTag, std::string, EclDeckFileName);
edgeWeightsMethod_ = Dune::EdgeWeightMethod(EWOMS_GET_PARAM(TypeTag, int, EdgeWeightsMethod)); edgeWeightsMethod_ = Dune::EdgeWeightMethod(EWOMS_GET_PARAM(TypeTag, int, EdgeWeightsMethod));
#if HAVE_OPENCL #if HAVE_OPENCL || HAVE_ROCSPARSE
numJacobiBlocks_ = EWOMS_GET_PARAM(TypeTag, int, NumJacobiBlocks); numJacobiBlocks_ = EWOMS_GET_PARAM(TypeTag, int, NumJacobiBlocks);
#endif #endif

6
ebos/eclgenericvanguard.hh
View File

@ -202,7 +202,7 @@ public:
*/ */
int numJacobiBlocks() const int numJacobiBlocks() const
{ {
#if HAVE_OPENCL #if HAVE_OPENCL || HAVE_ROCSPARSE
return numJacobiBlocks_; return numJacobiBlocks_;
#else #else
return 0; return 0;
@ -283,9 +283,9 @@ protected:
std::string fileName_; std::string fileName_;
Dune::EdgeWeightMethod edgeWeightsMethod_; Dune::EdgeWeightMethod edgeWeightsMethod_;
#if HAVE_OPENCL #if HAVE_OPENCL || HAVE_ROCSPARSE
int numJacobiBlocks_{0}; int numJacobiBlocks_{0};
#endif // HAVE_OPENCL #endif // HAVE_OPENCL || HAVE_ROCSPARSE
bool ownersFirst_; bool ownersFirst_;
#if HAVE_MPI #if HAVE_MPI

5
opm/simulators/linalg/bda/rocsparseSolverBackend.cpp
View File

@ -526,6 +526,9 @@ void rocsparseSolverBackend<block_size>::solve_system(WellContributions &wellCon
Timer t; Timer t;
// actually solve // actually solve
gpu_pbicgstab(wellContribs, res);
HIP_CHECK(hipStreamSynchronize(stream));
#if 0
try { try {
gpu_pbicgstab(wellContribs, res); gpu_pbicgstab(wellContribs, res);
} catch (const cl::Error& error) { } catch (const cl::Error& error) {
@ -538,9 +541,9 @@ void rocsparseSolverBackend<block_size>::solve_system(WellContributions &wellCon
// rethrow exception by OPM_THROW in the try{}, without this, a segfault occurs // rethrow exception by OPM_THROW in the try{}, without this, a segfault occurs
throw error; throw error;
} }
#endif
if (verbosity >= 3) { if (verbosity >= 3) {
HIP_CHECK(hipStreamSynchronize(stream));
std::ostringstream out; std::ostringstream out;
out << "rocsparseSolver::solve_system(): " << t.stop() << " s"; out << "rocsparseSolver::solve_system(): " << t.stop() << " s";
OpmLog::info(out.str()); OpmLog::info(out.str());

1
opm/simulators/linalg/bda/rocsparseSolverBackend.hpp
View File

@ -22,7 +22,6 @@
#include <memory> #include <memory>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp> #include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/BdaSolver.hpp> #include <opm/simulators/linalg/bda/BdaSolver.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp> #include <opm/simulators/linalg/bda/WellContributions.hpp>