sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Modified the multiplication of a sparse matrix with a dense vector to only use the parallel version if available and the number of nonzero entries exceeds a certain threshold. 

Former-commit-id: 07957b2d29
tempestpy_adaptions
dehnert 10 years ago
parent
d40573640f
commit
01cefbb2c0
2 changed files with 59 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      src/storage/SparseMatrix.cpp
  2. 26
      src/storage/SparseMatrix.h

48
src/storage/SparseMatrix.cpp
View File

@ -770,16 +770,23 @@ namespace storm {
template<typename T>
void SparseMatrix<T>::multiplyWithVector(std::vector<T> const& vector, std::vector<T>& result) const {
#ifdef STORM_HAVE_INTELTBB
tbb::parallel_for(tbb::blocked_range<uint_fast64_t>(0, result.size(), 10),
[&] (tbb::blocked_range<uint_fast64_t> const& range) {
uint_fast64_t startRow = range.begin();
uint_fast64_t endRow = range.end();
const_iterator it = this->begin(startRow);
if (this->getNonzeroEntryCount() > 10000) {
return this->multiplyWithVectorParallel(vector, result);
} else {
return this->multiplyWithVectorSequential(vector, result);
}
#else
return multiplyWithVectorSequential(vector, result);
#endif
}
template<typename T>
void SparseMatrix<T>::multiplyWithVectorSequential(std::vector<T> const& vector, std::vector<T>& result) const {
const_iterator it = this->begin();
const_iterator ite;
std::vector<uint_fast64_t>::const_iterator rowIterator = this->rowIndications.begin() + startRow;
std::vector<uint_fast64_t>::const_iterator rowIteratorEnd = this->rowIndications.begin() + endRow;
std::vector<T>::iterator resultIterator = result.begin() + startRow;
std::vector<T>::iterator resultIteratorEnd = result.begin() + endRow;
typename std::vector<uint_fast64_t>::const_iterator rowIterator = rowIndications.begin();
typename std::vector<T>::iterator resultIterator = result.begin();
typename std::vector<T>::iterator resultIteratorEnd = result.end();
for (; resultIterator != resultIteratorEnd; ++rowIterator, ++resultIterator) {
*resultIterator = storm::utility::constantZero<T>();
@ -788,13 +795,21 @@ namespace storm {
*resultIterator += it->getValue() * vector[it->getColumn()];
}
}
});
#else
const_iterator it = this->begin();
}
#ifdef STORM_HAVE_INTELTBB
template<typename T>
void SparseMatrix<T>::multiplyWithVectorParallel(std::vector<T> const& vector, std::vector<T>& result) const {
tbb::parallel_for(tbb::blocked_range<uint_fast64_t>(0, result.size(), 10),
[&] (tbb::blocked_range<uint_fast64_t> const& range) {
uint_fast64_t startRow = range.begin();
uint_fast64_t endRow = range.end();
const_iterator it = this->begin(startRow);
const_iterator ite;
typename std::vector<uint_fast64_t>::const_iterator rowIterator = rowIndications.begin();
typename std::vector<T>::iterator resultIterator = result.begin();
typename std::vector<T>::iterator resultIteratorEnd = result.end();
std::vector<uint_fast64_t>::const_iterator rowIterator = this->rowIndications.begin() + startRow;
std::vector<uint_fast64_t>::const_iterator rowIteratorEnd = this->rowIndications.begin() + endRow;
typename std::vector<T>::iterator resultIterator = result.begin() + startRow;
typename std::vector<T>::iterator resultIteratorEnd = result.begin() + endRow;
for (; resultIterator != resultIteratorEnd; ++rowIterator, ++resultIterator) {
*resultIterator = storm::utility::constantZero<T>();
@ -803,8 +818,9 @@ namespace storm {
*resultIterator += it->getValue() * vector[it->getColumn()];
}
}
#endif
});
}
#endif
template<typename T>
uint_fast64_t SparseMatrix<T>::getSizeInMemory() const {

26
src/storage/SparseMatrix.h
View File

@ -576,7 +576,9 @@ namespace storm {
std::vector<T> getPointwiseProductRowSumVector(storm::storage::SparseMatrix<T> const& otherMatrix) const;
/*!
* Multiplies the matrix with the given vector and writes the result to given result vector.
* Multiplies the matrix with the given vector and writes the result to the given result vector. If a
* parallel implementation is available and it is considered worthwhile (heuristically, based on the metrics
* of the matrix), the multiplication is carried out in parallel.
*
* @param vector The vector with which to multiply the matrix.
* @param result The vector that is supposed to hold the result of the multiplication after the operation.
@ -584,6 +586,28 @@ namespace storm {
*/
void multiplyWithVector(std::vector<T> const& vector, std::vector<T>& result) const;
/*!
* Multiplies the matrix with the given vector in a sequential way and writes the result to the given result
* vector.
*
* @param vector The vector with which to multiply the matrix.
* @param result The vector that is supposed to hold the result of the multiplication after the operation.
* @return The product of the matrix and the given vector as the content of the given result vector.
*/
void multiplyWithVectorSequential(std::vector<T> const& vector, std::vector<T>& result) const;
#ifdef STORM_HAVE_INTELTBB
/*!
* Multiplies the matrix with the given vector in a parallel fashion using Intel's TBB and writes the result
* to the given result vector.
*
* @param vector The vector with which to multiply the matrix.
* @param result The vector that is supposed to hold the result of the multiplication after the operation.
* @return The product of the matrix and the given vector as the content of the given result vector.
*/
void multiplyWithVectorParallel(std::vector<T> const& vector, std::vector<T>& result) const;
#endif
/*!
* Computes the sum of the entries in a given row.
*

Write Preview
Loading…
Cancel
Save