From 389c2509a67fe1cc648acb0ef8b12bad4d4660fb Mon Sep 17 00:00:00 2001
From: akuesters <42005107+akuesters@users.noreply.github.com>
Date: Wed, 29 May 2019 14:24:07 +0200
Subject: [PATCH] Fixes managed memory issue on K80 (Jureca) (#755)
Fix a memory error triggered on the GPU when assertions were enabled. An assertion was testing a value in shared memory, that should have been stored in host memory.
---
arbor/backends/gpu/matrix_state_fine.hpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arbor/backends/gpu/matrix_state_fine.hpp b/arbor/backends/gpu/matrix_state_fine.hpp
index 6790c1e8..e2459166 100644
--- a/arbor/backends/gpu/matrix_state_fine.hpp
+++ b/arbor/backends/gpu/matrix_state_fine.hpp
@@ -117,9 +117,8 @@ public:
managed_vector<unsigned> num_cells_in_block;
// end of the data of each level
- // use data_size.back() to get the total data size
- // data_size >= size
- managed_vector<unsigned> data_size; // TODO rename
+ managed_vector<unsigned> data_partition;
+ std::size_t data_size;
// the meta data for each level for each block layed out linearly in memory
managed_vector<level> levels;
@@ -313,7 +312,7 @@ public:
levels.reserve(total_num_levels);
levels_start.reserve(branch_maps.size() + 1);
levels_start.push_back(0);
- data_size.reserve(branch_maps.size());
+ data_partition.reserve(branch_maps.size());
// offset into the packed data format, used to apply permutation on data
auto pos = 0u;
for (const auto& branch_map: branch_maps) {
@@ -345,8 +344,9 @@ public:
}
auto prev_end = levels_start.back();
levels_start.push_back(prev_end + branch_map.size());
- data_size.push_back(pos);
+ data_partition.push_back(pos);
}
+ data_size = pos;
// set matrix state
matrix_size = p.size();
@@ -406,9 +406,9 @@ public:
// the matrix components u, d and rhs are stored in packed form
auto nan = std::numeric_limits<double>::quiet_NaN();
- d = array(data_size.back(), nan);
- u = array(data_size.back(), nan);
- rhs = array(data_size.back(), nan);
+ d = array(data_size, nan);
+ u = array(data_size, nan);
+ rhs = array(data_size, nan);
// transform u_tmp values into packed u vector.
flat_to_packed(u_tmp, u);
@@ -461,7 +461,7 @@ public:
rhs.data(), d.data(), u.data(),
levels.data(), levels_start.data(),
num_cells_in_block.data(),
- data_size.data(),
+ data_partition.data(),
num_cells_in_block.size(), max_branches_per_level);
// unpermute the solution
@@ -475,14 +475,14 @@ public:
template <typename VFrom, typename VTo>
void flat_to_packed(const VFrom& from, VTo& to ) {
arb_assert(from.size()==matrix_size);
- arb_assert(to.size()==data_size.back());
+ arb_assert(to.size()==data_size);
scatter(from.data(), to.data(), perm.data(), perm.size());
}
template <typename VFrom, typename VTo>
void packed_to_flat(const VFrom& from, VTo& to ) {
- arb_assert(from.size()==data_size.back());
+ arb_assert(from.size()==data_size);
arb_assert(to.size()==matrix_size);
gather(from.data(), to.data(), perm.data(), perm.size());
--
GitLab