Mentions légales du service

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

Modify simplified conf (ParamsHierarchicalSquareMat) for Hadamard...

Modify simplified conf (ParamsHierarchicalSquareMat) for Hadamard factorization to set packing_RL to False by default (it is quickest with backend=2020 and is ignored with backend=2016).
parent 453683e4
No related branches found
No related tags found
No related merge requests found
......@@ -21,7 +21,7 @@ classdef ParamsHierarchicalSquareMat < matfaust.factparams.ParamsHierarchical
%res_cons = [ res_cons, {ConstraintInt('sp',d,d,d*d/2^(i+1))} ];
end
p = p@matfaust.factparams.ParamsHierarchical(fact_cons, res_cons, stop_crit,...
stop_crit, 'is_update_way_R2L', true);
stop_crit, 'is_update_way_R2L', true, 'packing_RL', false);
end
end
methods(Static)
......
......@@ -1077,9 +1077,7 @@ class ParamsHierarchicalDFT(ParamsHierarchical):
def createParams(M, p):
pot = np.log2(M.shape[0])
if(pot > int(pot) or M.shape[0] != M.shape[1]):
raise ValueError('M must be a '
'square matrix of order a power of '
'two.')
raise ValueError('M must be of order a power of two.')
pot = int(pot)
return ParamsHierarchicalDFT(pot)
......@@ -1162,11 +1160,12 @@ class ParamsHierarchicalSquareMat(ParamsHierarchical):
stop_crit = StoppingCriterion(num_its=30)
super(ParamsHierarchicalSquareMat,
self).__init__([ConstraintInt(ConstraintName(cons_name),d,d,2)
for i in range(0,n-1)],
[ConstraintInt(ConstraintName(cons_name),d,d,int(d/2.**(i+1)))
for i in range(0,n-1)],
stop_crit, stop_crit,
is_update_way_R2L=True)
for i in range(0,n-1)],
[ConstraintInt(ConstraintName(cons_name),d,d,int(d/2.**(i+1)))
for i in range(0,n-1)],
stop_crit, stop_crit,
is_update_way_R2L=True,
packing_RL=False)
@staticmethod
def createParams(M, p):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment