Mentions légales du service

Skip to content
Snippets Groups Projects
Commit a6ea289a authored by hhakim's avatar hhakim
Browse files

Fix bug on hierarchical 2020 impl. 

The bug was because of the wrong order of factors (relatively to constraints) in certain situations where is_update_R2L or is_side_fact_left are not in their default values.

It fixes issue #136.
parent 6c2fc7dd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/algorithm/factorization/faust_hierarchical.hpp
+ 105
− 88
View file @ a6ea289a
......@@ -3,19 +3,18 @@ Faust::TransformHelper<FPP,DEVICE>* Faust::hierarchical(const Faust::MatDense<FP
Params<FPP,DEVICE, Real<FPP>> & p,
Real<FPP>& lambda, const bool compute_2norm_on_array)
{
auto S = new Faust::TransformHelper<FPP,DEVICE>(); // A is copied
S->push_back(&A);
Faust::MatGeneric<FPP,DEVICE> *Si;
const Faust::ConstraintGeneric *fac_cons, *res_cons;
Faust::MatGeneric<FPP,DEVICE> *zero_mat, *id_mat;
Faust::MatDense<FPP,DEVICE> * tmp_dense;
Faust::MatSparse<FPP,DEVICE> * tmp_sparse;
std::vector<Faust::MatGeneric<FPP,DEVICE>*> Si_vec;
std::vector<Faust::ConstraintGeneric*> Si_cons;
Real<FPP> lambda_ = p.init_lambda;
Real<FPP> glo_lambda = 1;
std::vector<const Faust::ConstraintGeneric*> & fac_constraints = p.cons[0];
std::vector<const Faust::ConstraintGeneric*> & res_constraints = p.cons[1];
auto S = new Faust::TransformHelper<FPP,DEVICE>(); // A is copied
S->push_back(&A);
Faust::MatGeneric<FPP,DEVICE> *Si;
const Faust::ConstraintGeneric *fac_cons, *res_cons;
int zero_dims[2], id_dims[2];
Faust::MatGeneric<FPP,DEVICE> *zero_mat, *id_mat;
Faust::MatDense<FPP,DEVICE> * tmp_dense;
Faust::MatSparse<FPP,DEVICE> * tmp_sparse;
std::vector<Faust::MatGeneric<FPP,DEVICE>*> Si_vec;
std::vector<Faust::ConstraintGeneric*> Si_cons;
Real<FPP> lambda_ = p.init_lambda;
Real<FPP> glo_lambda = 1;
//TODO: remove these local variables and use directly p.
const bool is_update_way_R2L = p.isUpdateWayR2L;
const bool is_fact_side_left = p.isFactSideLeft;
......@@ -25,89 +24,107 @@ Faust::TransformHelper<FPP,DEVICE>* Faust::hierarchical(const Faust::MatDense<FP
const unsigned int norm2_max_iter = p.norm2_max_iter;
const double step_size = p.step_size;
const bool constant_step_size = p.isConstantStepSize;
std::vector<const Faust::ConstraintGeneric*> & fac_constraints = is_fact_side_left? p.cons[1]: p.cons[0];
std::vector<const Faust::ConstraintGeneric*> & res_constraints = is_fact_side_left? p.cons[0]: p.cons[1];;
if(p.isVerbose) p.Display();
for(int i=0;i < fac_constraints.size();i++)
{
cout << "Faust::hierarchical: " << i+1 << endl;
if(is_fact_side_left)
{
Si = S->get_gen_fact_nonconst(0);
for(int i=0;i < fac_constraints.size();i++)
{
cout << "Faust::hierarchical: " << i+1 << endl;
if(is_fact_side_left)
{
Si = S->get_gen_fact_nonconst(0);
}
else
Si = S->get_gen_fact_nonconst(i);
fac_cons = fac_constraints[i];
res_cons = res_constraints[i];
// init factors for the local optimization (factorization of Si)
//TODO: refactor into a separate function init_zero_id
if(use_csr)
{
tmp_sparse = new Faust::MatSparse<FPP,DEVICE>(fac_constraints[i]->get_rows(), fac_constraints[i]->get_cols());
tmp_sparse->setZeros();
zero_mat = tmp_sparse;
tmp_sparse = new Faust::MatSparse<FPP,DEVICE>(res_constraints[i]->get_rows(), res_constraints[i]->get_cols());
tmp_sparse->setEyes();
id_mat = tmp_sparse;
}
else
{
}
else
Si = S->get_gen_fact_nonconst(i);
fac_cons = fac_constraints[i];
res_cons = res_constraints[i];
// init factors for the local optimization (factorization of Si)
//TODO: refactor into a separate function init_zero_id
if(! is_update_way_R2L && ! is_fact_side_left || is_update_way_R2L && is_fact_side_left)
{
zero_dims[0] = fac_cons->get_rows();
zero_dims[1] = fac_cons->get_cols();
id_dims[0] = res_cons->get_rows();
id_dims[1] = res_cons->get_cols();
}
else //if(! is_update_way_R2L && is_fact_side_left && is_update_way_R2L && ! is_fact_side_left)
{
zero_dims[0] = res_cons->get_rows();
zero_dims[1] = res_cons->get_cols();
id_dims[0] = fac_cons->get_rows();
id_dims[1] = fac_cons->get_cols();
}
if(use_csr)
{
tmp_sparse = new Faust::MatSparse<FPP,DEVICE>(zero_dims[0], zero_dims[1]);
tmp_sparse->setZeros();
zero_mat = tmp_sparse;
tmp_sparse = new Faust::MatSparse<FPP,DEVICE>(id_dims[0], id_dims[1]);
tmp_sparse->setEyes();
id_mat = tmp_sparse;
}
else
{
tmp_dense = new Faust::MatDense<FPP,DEVICE>(fac_constraints[i]->get_rows(), fac_constraints[i]->get_cols());
tmp_dense->setZeros();
zero_mat = tmp_dense;
tmp_dense = new Faust::MatDense<FPP,DEVICE>(res_constraints[i]->get_rows(), res_constraints[i]->get_cols());
tmp_dense->setEyes();
id_mat = tmp_dense;
}
if(is_update_way_R2L)
Si_vec = {id_mat, zero_mat};
else
Si_vec = {zero_mat, id_mat};
Si_cons = { const_cast<Faust::ConstraintGeneric*>(fac_cons), const_cast<Faust::ConstraintGeneric*>(res_cons) };
Faust::TransformHelper<FPP,DEVICE> Si_th(Si_vec, 1.0, false, false, true);
lambda_ = 1;
tmp_dense = dynamic_cast<Faust::MatDense<FPP,DEVICE>*>(Si);
if(tmp_dense == nullptr)
{
tmp_sparse = dynamic_cast<Faust::MatSparse<FPP,DEVICE>*>(Si);
tmp_dense = new MatDense<FPP,Cpu>(*tmp_sparse);
}
else tmp_sparse = nullptr;
tmp_dense = new Faust::MatDense<FPP,DEVICE>(zero_dims[0], zero_dims[1]);
tmp_dense->setZeros();
zero_mat = tmp_dense;
tmp_dense = new Faust::MatDense<FPP,DEVICE>(id_dims[0], id_dims[1]);
tmp_dense->setEyes();
id_mat = tmp_dense;
}
if(is_update_way_R2L)
Si_vec = {id_mat, zero_mat};
else
Si_vec = {zero_mat, id_mat};
Si_cons = { const_cast<Faust::ConstraintGeneric*>(fac_cons), const_cast<Faust::ConstraintGeneric*>(res_cons) };
Faust::TransformHelper<FPP,DEVICE> Si_th(Si_vec, 1.0, false, false, true);
lambda_ = 1;
tmp_dense = dynamic_cast<Faust::MatDense<FPP,DEVICE>*>(Si);
if(tmp_dense == nullptr)
{
tmp_sparse = dynamic_cast<Faust::MatSparse<FPP,DEVICE>*>(Si);
tmp_dense = new MatDense<FPP,Cpu>(*tmp_sparse);
}
else tmp_sparse = nullptr;
Faust::palm4msa2(*tmp_dense, Si_cons, Si_th, lambda_, p.stop_crit_2facts, is_update_way_R2L , use_csr, packing_RL, compute_2norm_on_array,
norm2_threshold, norm2_max_iter, constant_step_size, step_size);
if(tmp_sparse != nullptr)
// the Si factor has been converted into a MatDense in the memory
// storage
// delete it // TODO: palm4msa2 should handle this on its own
delete tmp_dense;
if(tmp_sparse != nullptr)
// the Si factor has been converted into a MatDense in the memory
// storage
// delete it // TODO: palm4msa2 should handle this on its own
delete tmp_dense;
//prepare global optimization
glo_lambda *= lambda_;
if(is_fact_side_left)
{
S->pop_front();
S->push_first(*(Si_th.begin()+1), false, false);
S->push_first(*(Si_th.begin()), false, false);
}
else
{
S->pop_back();
S->push_back(*(Si_th.begin()), false, false);
S->push_back(*(Si_th.begin()+1), false, false);
}
//TODO: verify if the constraints order doesn't depend on
//is_fact_side_left
std::vector<Faust::ConstraintGeneric*> glo_cons;
for(auto ite_cons=fac_constraints.begin(); ite_cons != fac_constraints.begin()+i+1;ite_cons++)
glo_cons.push_back(const_cast<Faust::ConstraintGeneric*>(*ite_cons));
glo_cons.push_back(const_cast<Faust::ConstraintGeneric*>(res_constraints[i]));
//prepare global optimization
glo_lambda *= lambda_;
if(is_fact_side_left)
{
S->pop_front();
S->push_first(*(Si_th.begin()+1), false, false);
S->push_first(*(Si_th.begin()), false, false);
}
else
{
S->pop_back();
S->push_back(*(Si_th.begin()), false, false);
S->push_back(*(Si_th.begin()+1), false, false);
}
//TODO: verify if the constraints order doesn't depend on
//is_fact_side_left
std::vector<Faust::ConstraintGeneric*> glo_cons;
for(auto ite_cons=fac_constraints.begin(); ite_cons != fac_constraints.begin()+i+1;ite_cons++)
glo_cons.push_back(const_cast<Faust::ConstraintGeneric*>(*ite_cons));
glo_cons.push_back(const_cast<Faust::ConstraintGeneric*>(res_constraints[i]));
// global optimization
Faust::palm4msa2(A, glo_cons, *S, glo_lambda, p.stop_crit_global ,is_update_way_R2L, use_csr, packing_RL, compute_2norm_on_array,
// global optimization
Faust::palm4msa2(A, glo_cons, *S, glo_lambda, p.stop_crit_global ,is_update_way_R2L, use_csr, packing_RL, compute_2norm_on_array,
norm2_threshold, norm2_max_iter, constant_step_size, step_size);
}
lambda = glo_lambda;
return S;
}
lambda = glo_lambda;
return S;
}
template<typename FPP, FDevice DEVICE>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment