Commit 61a31463 authored by André Anjos's avatar André Anjos 💬

Merge branch '24-updated-api-in-bob-math-requires-changes-here-too' into 'master'

Adapted linsolve API of new bob.math version

Closes #24

See merge request !25
parents e2d32d1d 82b7885e
Pipeline #10485 passed with stages
in 15 minutes and 48 seconds
......@@ -206,7 +206,7 @@ void bob::learn::em::IVectorMachine::resizeTmp()
void bob::learn::em::IVectorMachine::forward(const bob::learn::em::GMMStats& gs,
blitz::Array<double,1>& ivector) const
{
bob::core::array::assertSameDimensionLength(ivector.extent(0), (int)m_rt);
bob::core::array::assertSameDimensionLength(ivector.extent(0), (int)m_rt);
forward_(gs, ivector);
}
......@@ -246,6 +246,5 @@ void bob::learn::em::IVectorMachine::forward_(const bob::learn::em::GMMStats& gs
computeTtSigmaInvFnorm(gs, m_tmp_t1);
// Solves m_tmp_tt.ivector = m_tmp_t1
bob::math::linsolve(m_tmp_tt, ivector, m_tmp_t1);
bob::math::linsolve(m_tmp_tt, m_tmp_t1, ivector);
}
......@@ -170,7 +170,7 @@ void bob::learn::em::IVectorTrainer::mStep(
if (blitz::all(acc_Nij_wij2_c == 0)) // TODO
Tt_c = 0;
else
bob::math::linsolve(tacc_Nij_wij2_c, Tt_c, tacc_Fnormij_wij_c);
bob::math::linsolve(tacc_Nij_wij2_c, tacc_Fnormij_wij_c, Tt_c);
if (m_update_sigma)
{
blitz::Array<double,1> sigma_c = sigma(blitz::Range(c*D,(c+1)*D-1));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment