Skip to content
Snippets Groups Projects
Commit 82b7885e authored by Manuel Günther's avatar Manuel Günther
Browse files

Adapted linsolve API of new bob.math version

parent e2d32d1d
No related branches found
No related tags found
1 merge request!25Adapted linsolve API of new bob.math version
Pipeline #
...@@ -206,7 +206,7 @@ void bob::learn::em::IVectorMachine::resizeTmp() ...@@ -206,7 +206,7 @@ void bob::learn::em::IVectorMachine::resizeTmp()
void bob::learn::em::IVectorMachine::forward(const bob::learn::em::GMMStats& gs, void bob::learn::em::IVectorMachine::forward(const bob::learn::em::GMMStats& gs,
blitz::Array<double,1>& ivector) const 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); forward_(gs, ivector);
} }
...@@ -246,6 +246,5 @@ void bob::learn::em::IVectorMachine::forward_(const bob::learn::em::GMMStats& gs ...@@ -246,6 +246,5 @@ void bob::learn::em::IVectorMachine::forward_(const bob::learn::em::GMMStats& gs
computeTtSigmaInvFnorm(gs, m_tmp_t1); computeTtSigmaInvFnorm(gs, m_tmp_t1);
// Solves m_tmp_tt.ivector = 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( ...@@ -170,7 +170,7 @@ void bob::learn::em::IVectorTrainer::mStep(
if (blitz::all(acc_Nij_wij2_c == 0)) // TODO if (blitz::all(acc_Nij_wij2_c == 0)) // TODO
Tt_c = 0; Tt_c = 0;
else 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) if (m_update_sigma)
{ {
blitz::Array<double,1> sigma_c = sigma(blitz::Range(c*D,(c+1)*D-1)); blitz::Array<double,1> sigma_c = sigma(blitz::Range(c*D,(c+1)*D-1));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment