Relintai/pmlpp
1
0
Fork 0
mirror of https://github.com/Relintai/pmlpp.git synced 2024-12-22 15:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MLPPTensor3::set_from_std_vectors().

Browse Source
This commit is contained in:
Relintai 2023-12-29 17:52:43 +01:00
parent 6a7448b278
commit c793777ffb
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mlpp/lin_alg/mlpp_tensor3.cpp
View File

@ -2223,26 +2223,25 @@ void MLPPTensor3::set_from_std_vectors(const std::vector<std::vector<std::vector
return; return;
} }
resize(Size3i(p_from[1].size(), p_from[0].size(), p_from.size())); resize(Size3i(p_from[0][0].size(), p_from[0].size(), p_from.size()));
if (data_size() == 0) { if (data_size() == 0) {
reset(); reset();
return; return;
} }
for (uint32_t k = 0; k < p_from.size(); ++k) { for (uint32_t z = 0; z < p_from.size(); ++z) {
const std::vector<std::vector<real_t>> &fm = p_from[k]; const std::vector<std::vector<real_t>> &vxy = p_from[z];
for (uint32_t i = 0; i < p_from.size(); ++i) { for (uint32_t y = 0; y < vxy.size(); ++y) {
const std::vector<real_t> &r = fm[i]; ERR_CONTINUE(vxy.size() != static_cast<uint32_t>(_size.y));
ERR_CONTINUE(r.size() != static_cast<uint32_t>(_size.x)); const std::vector<real_t> &vx = vxy[y];
int start_index = i * _size.x; ERR_CONTINUE(vx.size() != static_cast<uint32_t>(_size.x));
const real_t *from_ptr = &r[0]; for (uint32_t x = 0; x < vx.size(); ++x) {
for (int j = 0; j < _size.x; j++) { element_set(y, x, z, vx[x]);
_data[start_index + j] = from_ptr[j];
} }
} }
} }