Skip to content

[Core] Fix vOp operations truncating the target vector when an operand is empty #6445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alxbilger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Core] Fix vOp operations truncating the target vector when an operand is empty #6445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 55 additions & 16 deletions Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,7 +1602,8 @@ bool vOp_vf(MechanicalObject<DataTypes>& self, core::VecId v, Real_t<DataTypes>
{
if constexpr (requires(core::StateVecType_t<DataTypes, vtype> vc, Real_t<DataTypes> fc){vc[0] *= fc;})
{
auto vv = helper::getWriteOnlyAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
// write accessor (instead of write-only accessor) because content must be updated if dirty before the multiplication
auto vv = helper::getWriteAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
for (unsigned int i = 0; i < vv.size(); ++i)
{
vv[i] *= k;
Expand All @@ -1619,9 +1620,14 @@ bool vOp_vbf(MechanicalObject<DataTypes>& self, core::VecId v, core::ConstVecId
{
// Read accessors are created before the write-only accessor on purpose: see vOp_va.
auto vb = helper::getReadAccessor(*self.read(core::TVecId<btype, core::V_READ>(b)));
if (vb.empty())
return true;

// write-only accessor (instead of write-accessor) because content is irrelevant and will be overwritten
auto vv = helper::getWriteOnlyAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
vv.resize(vb.size());
for (unsigned int i = 0; i < vv.size(); ++i)
if (vv.size() < vb.size())
vv.resize(vb.size());
for (unsigned int i = 0; i < vb.size(); ++i)
{
vv[i] = vb[i] * k;
}
Expand All @@ -1641,6 +1647,8 @@ bool vOp_va(MechanicalObject<DataTypes>& self, core::VecId v, core::ConstVecId b
// copy-on-write shared_ptr and would free the buffer captured by a write accessor
// opened earlier. This matters in particular when v == b (self-copy of a linked Data).
auto vb = helper::getReadAccessor(*self.read(core::TVecId<btype, core::V_READ>(b)));

// write-only accessor (instead of write-accessor) because content is irrelevant and will be overwritten
auto vv = helper::getWriteOnlyAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
vv.wref() = vb.ref();
return true;
Expand All @@ -1659,9 +1667,14 @@ bool vOp_vb(MechanicalObject<DataTypes>& self, core::VecId v, core::ConstVecId b
{
// Read accessors are created before the write-only accessor on purpose: see vOp_va.
auto vb = helper::getReadAccessor(*self.read(core::TVecId<btype, core::V_READ>(b)));
auto vv = helper::getWriteOnlyAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
vv.resize(vb.size());
for (unsigned int i = 0; i < vv.size(); ++i)
if (vb.empty())
return true;

// write accessor (instead of write-only accessor) because content must be updated if dirty before the accumulation
auto vv = helper::getWriteAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
if (vv.size() < vb.size())
vv.resize(vb.size());
for (unsigned int i = 0; i < vb.size(); ++i)
{
vv[i] += vb[i];
}
Expand All @@ -1677,9 +1690,12 @@ bool vOp_avf(MechanicalObject<DataTypes>& self, core::VecId v, core::ConstVecId
{
// Read accessors are created before the write-only accessor on purpose: see vOp_va.
auto vb = helper::getReadAccessor(*self.read(core::TVecId<btype, core::V_READ>(b)));
auto vv = helper::getWriteOnlyAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
vv.resize(vb.size());
for (unsigned int i = 0; i < vv.size(); ++i)

// write accessor (instead of write-only accessor) because content must be updated if dirty before the accumulation
auto vv = helper::getWriteAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
if (vv.size() < vb.size())
vv.resize(vb.size());
for (unsigned int i = 0; i < vb.size(); ++i)
{
vv[i] *= k;
vv[i] += vb[i];
Expand All @@ -1696,9 +1712,14 @@ bool vOp_v_inc_bf(MechanicalObject<DataTypes>& self, core::VecId v, core::ConstV
{
// Read accessors are created before the write-only accessor on purpose: see vOp_va.
auto vb = helper::getReadAccessor(*self.read(core::TVecId<btype, core::V_READ>(b)));
auto vv = helper::getWriteOnlyAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
vv.resize(vb.size());
for (unsigned int i = 0; i < vv.size(); ++i)
if (vb.empty())
return true;

// write accessor (instead of write-only accessor) because content must be updated if dirty before the accumulation
auto vv = helper::getWriteAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
if (vv.size() < vb.size())
vv.resize(vb.size());
for (unsigned int i = 0; i < vb.size(); ++i)
{
vv[i] += vb[i] * k;
}
Expand All @@ -1716,10 +1737,19 @@ bool vOp_vab(MechanicalObject<DataTypes>& self, core::VecId v, core::ConstVecId
{
// Read accessors are created before the write-only accessor on purpose: see vOp_va.
auto va = helper::getReadAccessor(*self.read(core::TVecId<atype, core::V_READ>(a)));
if (va.empty())
return true;

auto vb = helper::getReadAccessor(*self.read(core::TVecId<btype, core::V_READ>(b)));
if (vb.empty())
return true;

// write-only accessor (instead of write-accessor) because content is irrelevant and will be overwritten
auto vv = helper::getWriteOnlyAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
vv.resize(vb.size());
for (unsigned int i = 0; i < vv.size(); ++i)
const auto size = std::min(va.size(), vb.size());
if (vv.size() < size)
vv.resize(size);
for (unsigned int i = 0; i < size; ++i)
{
vv[i] = va[i] + vb[i];
}
Expand All @@ -1735,10 +1765,19 @@ bool vOp_vabf(MechanicalObject<DataTypes>& self, core::VecId v, core::ConstVecId
{
// Read accessors are created before the write-only accessor on purpose: see vOp_va.
auto va = helper::getReadAccessor(*self.read(core::TVecId<atype, core::V_READ>(a)));
if (va.empty())
return true;

auto vb = helper::getReadAccessor(*self.read(core::TVecId<btype, core::V_READ>(b)));
if (vb.empty())
return true;

// write-only accessor (instead of write-accessor) because content is irrelevant and will be overwritten
auto vv = helper::getWriteOnlyAccessor(*self.write(core::TVecId<vtype, core::V_WRITE>(v)));
vv.resize(vb.size());
for (unsigned int i = 0; i < vv.size(); ++i)
const auto size = std::min(va.size(), vb.size());
if (vv.size() < size)
vv.resize(size);
for (unsigned int i = 0; i < size; ++i)
{
vv[i] = va[i] + vb[i] * k;
}
Expand Down
Loading