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

Fix GPU tests, use Dune as reference instead of hardcoded

Browse Source
This commit is contained in:
Tong Dong Qiu 2022-03-29 14:38:45 +02:00
parent 57cc18cf1b
commit aa362ae239
2 changed files with 99 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tests/test_cusparseSolver.cpp
View File

@ -36,7 +36,8 @@
#include <dune/istl/bvector.hh> #include <dune/istl/bvector.hh>
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/matrixmarket.hh> #include <dune/istl/matrixmarket.hh>
#include <dune/istl/solver.hh> #include <dune/istl/solvers.hh>
#include <dune/istl/preconditioners.hh>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
@ -48,12 +49,13 @@ public:
}; };
template <int bz> template <int bz>
Dune::BlockVector<Dune::FieldVector<double, bz>>
testCusparseSolver(const boost::property_tree::ptree& prm, const std::string& matrix_filename, const std::string& rhs_filename)
{
using Matrix = Dune::BCRSMatrix<Dune::FieldMatrix<double, bz, bz>>; using Matrix = Dune::BCRSMatrix<Dune::FieldMatrix<double, bz, bz>>;
template <int bz>
using Vector = Dune::BlockVector<Dune::FieldVector<double, bz>>; using Vector = Dune::BlockVector<Dune::FieldVector<double, bz>>;
Matrix matrix;
template <int bz>
void readLinearSystem(const std::string& matrix_filename, const std::string& rhs_filename, Matrix<bz>& matrix, Vector<bz>& rhs)
{
{ {
std::ifstream mfile(matrix_filename); std::ifstream mfile(matrix_filename);
if (!mfile) { if (!mfile) {
@ -61,7 +63,6 @@ testCusparseSolver(const boost::property_tree::ptree& prm, const std::string& ma
} }
readMatrixMarket(matrix, mfile); readMatrixMarket(matrix, mfile);
} }
Vector rhs;
{ {
std::ifstream rhsfile(rhs_filename); std::ifstream rhsfile(rhs_filename);
if (!rhsfile) { if (!rhsfile) {
@ -69,6 +70,32 @@ testCusparseSolver(const boost::property_tree::ptree& prm, const std::string& ma
} }
readMatrixMarket(rhs, rhsfile); readMatrixMarket(rhs, rhsfile);
} }
}
template <int bz>
Dune::BlockVector<Dune::FieldVector<double, bz>>
getDuneSolution(Matrix<bz>& matrix, Vector<bz>& rhs)
{
Dune::InverseOperatorResult result;
Vector<bz> x(rhs.size());
typedef Dune::MatrixAdapter<Matrix<bz>,Vector<bz>,Vector<bz> > Operator;
Operator fop(matrix);
double relaxation = 0.9;
Dune::SeqILU<Matrix<bz>,Vector<bz>,Vector<bz> > prec(matrix, relaxation);
double reduction = 1e-2;
int maxit = 10;
int verbosity = 0;
Dune::BiCGSTABSolver<Vector<bz> > solver(fop, prec, reduction, maxit, verbosity);
solver.apply(x, rhs, result);
return x;
}
template <int bz>
Dune::BlockVector<Dune::FieldVector<double, bz>>
testCusparseSolver(const boost::property_tree::ptree& prm, Matrix<bz>& matrix, Vector<bz>& rhs)
{
const int linear_solver_verbosity = prm.get<int>("verbosity"); const int linear_solver_verbosity = prm.get<int>("verbosity");
const int maxit = prm.get<int>("maxiter"); const int maxit = prm.get<int>("maxiter");
@ -81,13 +108,15 @@ testCusparseSolver(const boost::property_tree::ptree& prm, const std::string& ma
const std::string linsolver("ilu0"); const std::string linsolver("ilu0");
Dune::InverseOperatorResult result; Dune::InverseOperatorResult result;
Vector x(rhs.size()); Vector<bz> x(rhs.size());
auto wellContribs = Opm::WellContributions::create("cusparse", false);
std::unique_ptr<Opm::BdaBridge<Matrix, Vector, bz> > bridge;
try {
bridge = std::make_unique<Opm::BdaBridge<Matrix, Vector, bz> >(accelerator_mode, fpga_bitstream, linear_solver_verbosity, maxit, tolerance, platformID, deviceID, opencl_ilu_reorder, linsolver);
bridge->solve_system(&matrix, rhs, *wellContribs, result); auto wellContribs = Opm::WellContributions::create("cusparse", false);
std::unique_ptr<Opm::BdaBridge<Matrix<bz>, Vector<bz>, bz> > bridge;
try {
bridge = std::make_unique<Opm::BdaBridge<Matrix<bz>, Vector<bz>, bz> >(accelerator_mode, fpga_bitstream, linear_solver_verbosity, maxit, tolerance, platformID, deviceID, opencl_ilu_reorder, linsolver);
auto mat2 = matrix; // deep copy to make sure nnz values are in contiguous memory
// matrix created by readMatrixMarket() did not have contiguous memory
bridge->solve_system(&mat2, rhs, *wellContribs, result);
bridge->get_result(x); bridge->get_result(x);
return x; return x;
@ -105,14 +134,17 @@ namespace pt = boost::property_tree;
void test3(const pt::ptree& prm) void test3(const pt::ptree& prm)
{ {
const int bz = 3; const int bz = 3;
auto sol = testCusparseSolver<bz>(prm, "matr33.txt", "rhs3.txt"); Matrix<bz> matrix;
Dune::BlockVector<Dune::FieldVector<double, bz>> expected {{-0.0131626, -3.5826e-6, 1.138362e-9}, Vector<bz> rhs;
{-1.25425e-3, -1.4167e-4, -0.0029366}, readLinearSystem("matr33.txt", "rhs3.txt", matrix, rhs);
{-4.54355e-4, 1.28682e-5, 4.7644e-6}}; Vector<bz> rhs2 = rhs; // deep copy, getDuneSolution() changes values in rhs vector
BOOST_REQUIRE_EQUAL(sol.size(), expected.size()); auto duneSolution = getDuneSolution<bz>(matrix, rhs);
auto sol = testCusparseSolver<bz>(prm, matrix, rhs2);
BOOST_REQUIRE_EQUAL(sol.size(), duneSolution.size());
for (size_t i = 0; i < sol.size(); ++i) { for (size_t i = 0; i < sol.size(); ++i) {
for (int row = 0; row < bz; ++row) { for (int row = 0; row < bz; ++row) {
BOOST_CHECK_CLOSE(sol[i][row], expected[i][row], 1e-3); BOOST_CHECK_CLOSE(sol[i][row], duneSolution[i][row], 1e-3);
} }
} }
} }

62
tests/test_openclSolver.cpp
View File

@ -36,6 +36,8 @@
#include <dune/istl/bvector.hh> #include <dune/istl/bvector.hh>
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/matrixmarket.hh> #include <dune/istl/matrixmarket.hh>
#include <dune/istl/solvers.hh>
#include <dune/istl/preconditioners.hh>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
@ -47,12 +49,13 @@ public:
}; };
template <int bz> template <int bz>
Dune::BlockVector<Dune::FieldVector<double, bz>>
testOpenclSolver(const boost::property_tree::ptree& prm, const std::string& matrix_filename, const std::string& rhs_filename)
{
using Matrix = Dune::BCRSMatrix<Dune::FieldMatrix<double, bz, bz>>; using Matrix = Dune::BCRSMatrix<Dune::FieldMatrix<double, bz, bz>>;
template <int bz>
using Vector = Dune::BlockVector<Dune::FieldVector<double, bz>>; using Vector = Dune::BlockVector<Dune::FieldVector<double, bz>>;
Matrix matrix;
template <int bz>
void readLinearSystem(const std::string& matrix_filename, const std::string& rhs_filename, Matrix<bz>& matrix, Vector<bz>& rhs)
{
{ {
std::ifstream mfile(matrix_filename); std::ifstream mfile(matrix_filename);
if (!mfile) { if (!mfile) {
@ -60,7 +63,6 @@ testOpenclSolver(const boost::property_tree::ptree& prm, const std::string& matr
} }
readMatrixMarket(matrix, mfile); readMatrixMarket(matrix, mfile);
} }
Vector rhs;
{ {
std::ifstream rhsfile(rhs_filename); std::ifstream rhsfile(rhs_filename);
if (!rhsfile) { if (!rhsfile) {
@ -68,7 +70,32 @@ testOpenclSolver(const boost::property_tree::ptree& prm, const std::string& matr
} }
readMatrixMarket(rhs, rhsfile); readMatrixMarket(rhs, rhsfile);
} }
}
template <int bz>
Dune::BlockVector<Dune::FieldVector<double, bz>>
getDuneSolution(Matrix<bz>& matrix, Vector<bz>& rhs)
{
Dune::InverseOperatorResult result;
Vector<bz> x(rhs.size());
typedef Dune::MatrixAdapter<Matrix<bz>,Vector<bz>,Vector<bz> > Operator;
Operator fop(matrix);
double relaxation = 0.9;
Dune::SeqILU<Matrix<bz>,Vector<bz>,Vector<bz> > prec(matrix, relaxation);
double reduction = 1e-2;
int maxit = 10;
int verbosity = 0;
Dune::BiCGSTABSolver<Vector<bz> > solver(fop, prec, reduction, maxit, verbosity);
solver.apply(x, rhs, result);
return x;
}
template <int bz>
Dune::BlockVector<Dune::FieldVector<double, bz>>
testOpenclSolver(const boost::property_tree::ptree& prm, Matrix<bz>& matrix, Vector<bz>& rhs)
{
const int linear_solver_verbosity = prm.get<int>("verbosity"); const int linear_solver_verbosity = prm.get<int>("verbosity");
const int maxit = prm.get<int>("maxiter"); const int maxit = prm.get<int>("maxiter");
const double tolerance = prm.get<double>("tol"); const double tolerance = prm.get<double>("tol");
@ -80,16 +107,18 @@ testOpenclSolver(const boost::property_tree::ptree& prm, const std::string& matr
const std::string linsolver("ilu0"); const std::string linsolver("ilu0");
Dune::InverseOperatorResult result; Dune::InverseOperatorResult result;
Vector x(rhs.size()); Vector<bz> x(rhs.size());
auto wellContribs = Opm::WellContributions::create("opencl", false); auto wellContribs = Opm::WellContributions::create("opencl", false);
std::unique_ptr<Opm::BdaBridge<Matrix, Vector, bz> > bridge; std::unique_ptr<Opm::BdaBridge<Matrix<bz>, Vector<bz>, bz> > bridge;
try { try {
bridge = std::make_unique<Opm::BdaBridge<Matrix, Vector, bz> >(accelerator_mode, fpga_bitstream, linear_solver_verbosity, maxit, tolerance, platformID, deviceID, opencl_ilu_reorder, linsolver); bridge = std::make_unique<Opm::BdaBridge<Matrix<bz>, Vector<bz>, bz> >(accelerator_mode, fpga_bitstream, linear_solver_verbosity, maxit, tolerance, platformID, deviceID, opencl_ilu_reorder, linsolver);
} catch (const std::logic_error& error) { } catch (const std::logic_error& error) {
BOOST_WARN_MESSAGE(true, error.what()); BOOST_WARN_MESSAGE(true, error.what());
throw PlatformInitException(error.what()); throw PlatformInitException(error.what());
} }
bridge->solve_system(&matrix, rhs, *wellContribs, result); auto mat2 = matrix; // deep copy to make sure nnz values are in contiguous memory
// matrix created by readMatrixMarket() did not have contiguous memory
bridge->solve_system(&mat2, rhs, *wellContribs, result);
bridge->get_result(x); bridge->get_result(x);
return x; return x;
@ -100,14 +129,17 @@ namespace pt = boost::property_tree;
void test3(const pt::ptree& prm) void test3(const pt::ptree& prm)
{ {
const int bz = 3; const int bz = 3;
auto sol = testOpenclSolver<bz>(prm, "matr33.txt", "rhs3.txt"); Matrix<bz> matrix;
Dune::BlockVector<Dune::FieldVector<double, bz>> expected {{-0.0131626, -3.58263e-6, 1.13836e-9}, Vector<bz> rhs;
{-1.25425e-3, -1.4167e-4, -0.0029366}, readLinearSystem("matr33.txt", "rhs3.txt", matrix, rhs);
{-4.5436e-4, 1.28682e-5, 4.7644e-6}}; Vector<bz> rhs2 = rhs; // deep copy, getDuneSolution() changes values in rhs vector
BOOST_REQUIRE_EQUAL(sol.size(), expected.size()); auto duneSolution = getDuneSolution<bz>(matrix, rhs);
auto sol = testOpenclSolver<bz>(prm, matrix, rhs2);
BOOST_REQUIRE_EQUAL(sol.size(), duneSolution.size());
for (size_t i = 0; i < sol.size(); ++i) { for (size_t i = 0; i < sol.size(); ++i) {
for (int row = 0; row < bz; ++row) { for (int row = 0; row < bz; ++row) {
BOOST_CHECK_CLOSE(sol[i][row], expected[i][row], 1e-3); BOOST_CHECK_CLOSE(sol[i][row], duneSolution[i][row], 1e-3);
} }
} }
} }