Browse Source

fixes when tbb is enabled

tempestpy_adaptions
TimQu 7 years ago
parent
commit
5be8de293c
  1. 4
      src/storm/solver/GmmxxMultiplier.cpp
  2. 4
      src/storm/solver/NativeMultiplier.cpp

4
src/storm/solver/GmmxxMultiplier.cpp

@ -191,9 +191,9 @@ namespace storm {
void GmmxxMultiplier<ValueType>::multAddParallel(std::vector<ValueType> const& x, std::vector<ValueType> const* b, std::vector<ValueType>& result) const {
#ifdef STORM_HAVE_INTELTBB
if (b) {
gmm::mult_add_parallel(x, *b, result);
gmm::mult_add_parallel(gmmMatrix, x, *b, result);
} else {
gmm::mult_parallel(x, result);
gmm::mult_parallel(gmmMatrix, x, result);
}
#else
STORM_LOG_WARN("Storm was built without support for Intel TBB, defaulting to sequential version.");

4
src/storm/solver/NativeMultiplier.cpp

@ -100,7 +100,7 @@ namespace storm {
template<typename ValueType>
void NativeMultiplier<ValueType>::multAddParallel(std::vector<ValueType> const& x, std::vector<ValueType> const* b, std::vector<ValueType>& result) const {
#ifdef STORM_HAVE_INTELTBB
matrix.multiplyWithVectorParallel(x, result, b);
this->matrix.multiplyWithVectorParallel(x, result, b);
#else
STORM_LOG_WARN("Storm was built without support for Intel TBB, defaulting to sequential version.");
multAdd(x, b, result);
@ -110,7 +110,7 @@ namespace storm {
template<typename ValueType>
void NativeMultiplier<ValueType>::multAddReduceParallel(storm::solver::OptimizationDirection const& dir, std::vector<uint64_t> const& rowGroupIndices, std::vector<ValueType> const& x, std::vector<ValueType> const* b, std::vector<ValueType>& result, std::vector<uint64_t>* choices) const {
#ifdef STORM_HAVE_INTELTBB
matrix.multiplyAndReduceParallel(dir, rowGroupIndices, x, b, result, choices);
this->matrix.multiplyAndReduceParallel(dir, rowGroupIndices, x, b, result, choices);
#else
STORM_LOG_WARN("Storm was built without support for Intel TBB, defaulting to sequential version.");
multAddReduce(dir, rowGroupIndices, x, b, result, choices);

Loading…
Cancel
Save