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

Replaced prints with OpmLog. BdaBridge disables GPU and continues with Dune if unsupported blocksize is used

Browse Source
This commit is contained in:
T.D. (Tongdong) Qiu 2019-12-06 17:23:32 +01:00
parent 8b92c5dca6
commit b355537e04
2 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
opm/simulators/linalg/bda/BdaBridge.cpp
View File

@ -19,6 +19,7 @@
#include <config.h>
#include <memory>
#include <sstream>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/material/common/Unused.hpp>
@ -93,7 +94,7 @@ int checkZeroDiagonal(BridgeMatrix& mat) {
// iterate sparsity pattern from Matrix and put colIndices and rowPointers in arrays
// sparsity pattern should stay the same due to matrix-add-well-contributions
template <class BridgeMatrix>
void getSparsityPattern(BridgeMatrix& mat, std::vector<int> &h_rows, std::vector<int> &h_cols, int dim) {
void getSparsityPattern(BridgeMatrix& mat, std::vector<int> &h_rows, std::vector<int> &h_cols) {
int sum_nnzs = 0;
// convert colIndices and rowPointers
@ -130,8 +131,8 @@ void BdaBridge::solve_system(BridgeMatrix *mat OPM_UNUSED, BridgeVector &b OPM_U
int nnz = mat->nonzeroes()*dim*dim;
if(dim != 3){
std::cerr << "Error can only use cusparseSolver with blocksize = 3 at this time" << std::endl;
exit(1);
OpmLog::error("cusparseSolver only accepts blocksize = 3 at this time");
use_gpu = false;
}
if(h_rows.capacity() == 0){
@ -140,16 +141,20 @@ void BdaBridge::solve_system(BridgeMatrix *mat OPM_UNUSED, BridgeVector &b OPM_U
#if PRINT_TIMERS_BRIDGE
Dune::Timer t;
#endif
getSparsityPattern(*mat, h_rows, h_cols, dim);
getSparsityPattern(*mat, h_rows, h_cols);
#if PRINT_TIMERS_BRIDGE
printf("getSparsityPattern(): %.4f s\n", t.stop());
std::ostringstream out;
out << "getSparsityPattern() took: " << t.stop() << " s";
OpmLog::info(out.str());
#endif
}
#if PRINT_TIMERS_BRIDGE
Dune::Timer t_zeros;
int numZeros = checkZeroDiagonal(*mat);
printf("Checking zeros took %f s, found %d zeros\n", t_zeros.stop(), numZeros);
std::ostringstream out;
out << "Checking zeros took: " << t_zeros.stop() << " s, found " << numZeros << " zeros";
OpmLog::info(out.str());
#else
checkZeroDiagonal(*mat);
#endif

51
opm/simulators/linalg/bda/cusparseSolverBackend.cu
View File

@ -26,6 +26,9 @@
#include <cuda_runtime.h>
#include <iostream>
#include <sys/time.h>
#include <sstream>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/simulators/linalg/bda/cusparseSolverBackend.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp>
@ -78,7 +81,9 @@ namespace Opm
cublasDnrm2(cublasHandle, n, d_r, 1, &norm_0);
if(verbosity > 1){
printf("Initial norm: %.5e\n", norm_0);
std::ostringstream out;
out << std::scientific << "cusparseSolver initial norm: " << norm_0;
OpmLog::info(out.str());
}
for(it = 0.5; it < maxit; it+=0.5){
@ -147,7 +152,9 @@ namespace Opm
}
if(verbosity > 1){
printf("it: %.1f, norm: %.5e\n", it, norm);
std::ostringstream out;
out << "it: " << it << std::scientific << ", norm: " << norm;
OpmLog::info(out.str());
}
}
@ -160,7 +167,10 @@ namespace Opm
res.converged = (it != (maxit + 0.5));
if(verbosity > 0){
printf("=== converged: %d, conv_rate: %.2f, time: %f, time per iteration: %f, iterations: %.1f\n", res.converged, res.conv_rate, res.elapsed, res.elapsed/it, it);
std::ostringstream out;
out << "=== converged: " << res.converged << ", conv_rate: " << res.conv_rate << ", time: " << res.elapsed << \
", time per iteration: " << res.elapsed/it << ", iterations: " << it;
OpmLog::info(out.str());
}
}
@ -171,8 +181,13 @@ namespace Opm
this->BLOCK_SIZE = dim;
this->nnzb = nnz/BLOCK_SIZE/BLOCK_SIZE;
Nb = (N + dim - 1) / dim;
printf("Initializing GPU, N: %d, nnz: %d, Nb: %d\n", N, nnz, Nb);
printf("Minit: %d, maxit: %d, tolerance: %.1e\n", minit, maxit, tolerance);
std::ostringstream out;
out << "Initializing GPU, matrix size: " << N << " blocks, nnz: " << nnzb << " blocks";
OpmLog::info(out.str());
out.str("");
out.clear();
out << "Minit: " << minit << ", maxit: " << maxit << std::scientific << ", tolerance: " << tolerance;
OpmLog::info(out.str());
int deviceID = 0;
cudaSetDevice(deviceID);
@ -180,8 +195,10 @@ namespace Opm
struct cudaDeviceProp props;
cudaGetDeviceProperties(&props, deviceID);
cudaCheckLastError("Could not get device properties");
std::cout << "Name: " << props.name << "\n";
printf("CC: %d.%d\n", props.major, props.minor);
out.str("");
out.clear();
out << "Name GPU: " << props.name << ", Compute Capability: " << props.major << "." << props.minor;
OpmLog::info(out.str());
cudaStreamCreate(&stream);
cudaCheckLastError("Could not create stream");
@ -276,7 +293,9 @@ namespace Opm
if(verbosity > 2){
cudaStreamSynchronize(stream);
t2 = second();
printf("cusparseSolver::copy_system_to_gpu(): %f s\n", t2-t1);
std::ostringstream out;
out << "cusparseSolver::copy_system_to_gpu(): " << t2-t1 << " s";
OpmLog::info(out.str());
}
} // end copy_system_to_gpu()
@ -296,7 +315,9 @@ namespace Opm
if(verbosity > 2){
cudaStreamSynchronize(stream);
t2 = second();
printf("cusparseSolver::update_system_on_gpu(): %f s\n", t2-t1);
std::ostringstream out;
out << "cusparseSolver::update_system_on_gpu(): " << t2-t1 << " s";
OpmLog::info(out.str());
}
} // end update_system_on_gpu()
@ -377,7 +398,9 @@ namespace Opm
if(verbosity > 2){
cudaStreamSynchronize(stream);
t2 = second();
printf("cusparseSolver::analyse_matrix(): %f s\n", t2-t1);
std::ostringstream out;
out << "cusparseSolver::analyse_matrix(): " << t2-t1 << " s";
OpmLog::info(out.str());
}
return true;
@ -406,7 +429,9 @@ namespace Opm
if(verbosity > 2){
cudaStreamSynchronize(stream);
t2 = second();
printf("cusparseSolver::create_preconditioner(): %f s\n", t2-t1);
std::ostringstream out;
out << "cusparseSolver::create_preconditioner(): " << t2-t1 << " s";
OpmLog::info(out.str());
}
return true;
} // end create_preconditioner()
@ -438,7 +463,9 @@ namespace Opm
if(verbosity > 2){
t2 = second();
printf("cusparseSolver::post_process(): %f s\n", t2-t1);
std::ostringstream out;
out << "cusparseSolver::post_process(): " << t2-t1 << " s";
OpmLog::info(out.str());
}
} // end post_process()