Mentions légales du service

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

Remove old unused PALM4MSA 2020 implementation (cf. issue #244).

parent 72be7706
No related branches found
No related tags found
No related merge requests found
...@@ -115,12 +115,7 @@ int main(int argc, char* argv[]) ...@@ -115,12 +115,7 @@ int main(int argc, char* argv[])
vector<ConstraintGeneric*> gpu_constraints{&gpu_c1, &gpu_c2}; vector<ConstraintGeneric*> gpu_constraints{&gpu_c1, &gpu_c2};
#endif #endif
if(meth == 1) if(meth == 2)
{
cout << "use impl1" << endl;
Faust::palm4msa<FPP,Cpu>(data, constraints, facts, lambda, sc, is_update_way_R2L, factors_format, compute_2norm_on_array, norm2_threshold, norm2_max_iter, false, FAUST_PRECISION, on_gpu, true);
}
else if(meth == 2)
{ {
cout << "use impl2" << endl; cout << "use impl2" << endl;
Faust::palm4msa2<FPP,Cpu>(data, constraints, facts, lambda, sc, is_update_way_R2L, factors_format, packing_RL, no_normalization, no_lambda, MHTPParams<FPP>(), compute_2norm_on_array, norm2_threshold, norm2_max_iter, false, FAUST_PRECISION, on_gpu); Faust::palm4msa2<FPP,Cpu>(data, constraints, facts, lambda, sc, is_update_way_R2L, factors_format, packing_RL, no_normalization, no_lambda, MHTPParams<FPP>(), compute_2norm_on_array, norm2_threshold, norm2_max_iter, false, FAUST_PRECISION, on_gpu);
...@@ -138,7 +133,7 @@ int main(int argc, char* argv[]) ...@@ -138,7 +133,7 @@ int main(int argc, char* argv[])
#endif #endif
else else
{ {
std::cerr << "meth (arg 1) must be 1 or 2." << endl; std::cerr << "meth (arg 1) must be 2 or 3." << endl;
} }
// auto left_th_2 = th->left(2); // auto left_th_2 = th->left(2);
// left_th_2->display(); // left_th_2->display();
......
...@@ -37,27 +37,6 @@ ...@@ -37,27 +37,6 @@
namespace Faust namespace Faust
{ {
template <typename FPP, FDevice DEVICE>
void palm4msa(
/** input matrix */
const MatDense<FPP,DEVICE>& A,
/* input constraints */
std::vector<ConstraintGeneric*> & constraints,
/** output factors (if not initialized to size nfacts, set to nfacts identities (with constraints dims) */
TransformHelper<FPP,DEVICE>& S,
/** lambda output, intialized from outside */
FPP& lambda,
//const unsigned int nites,
const StoppingCriterion<Real<FPP>>& sc,
const bool is_update_way_R2L=false,
const FactorsFormat factors_format=AllDynamic,
const bool compute_2norm_on_array=false,
const Real<FPP> norm2_threshold=FAUST_PRECISION,
const unsigned int norm2_max_iter=FAUST_NORM2_MAX_ITER,
const bool constant_step_size=false, const Real<FPP> step_size=FAUST_PRECISION,
const bool on_gpu=false,
const bool is_verbose=false); //TODO: the def of this decl must be updated in faust_palm4msa2020.hpp
template <typename FPP, FDevice DEVICE> template <typename FPP, FDevice DEVICE>
void palm4msa2( void palm4msa2(
...@@ -162,5 +141,4 @@ namespace Faust ...@@ -162,5 +141,4 @@ namespace Faust
} }
#include "faust_palm4msa2020.hpp" #include "faust_palm4msa2020.hpp"
#include "faust_palm4msa2020_2.hpp"
#endif #endif
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment