Mentions légales du service

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

Fix regression provoked by 39b96491: the constraint mat wasn't properly...

Fix regression provoked by 39b96491: the constraint mat wasn't properly converted in pyx code which made fail the hierarchical factorization of DFT matrix.
parent ea0d434b
No related branches found
No related tags found
No related merge requests found
......@@ -111,7 +111,8 @@ cdef class FaustAlgoGen@TYPE_NAME@:
elif(cons.is_mat_constraint()):
cpp_constraints[i] = <PyxConstraintMat[@TYPE@]*> \
PyMem_Malloc(sizeof(PyxConstraintMat[@TYPE@]))
tmp_mat = (cons._cons_value).astype(type2dtype('@TYPE@'))
cons._cons_value = cons._cons_value.astype(type2dtype('@TYPE@'))
tmp_mat = cons._cons_value
(<PyxConstraintMat[@TYPE@]*>cpp_constraints[i]).parameter =\
&tmp_mat[0,0]
(<PyxConstraintMat[@TYPE@]*>cpp_constraints[i]).parameter_sz =\
......@@ -258,7 +259,8 @@ cdef class FaustAlgoGen@TYPE_NAME@:
elif(cons.is_mat_constraint()):
cpp_constraints[i] = <PyxConstraintMat[@TYPE@]*> \
PyMem_Malloc(sizeof(PyxConstraintMat[@TYPE@]))
tmp_mat = cons._cons_value.astype(type2dtype('@TYPE@'))
cons._cons_value = cons._cons_value.astype(type2dtype('@TYPE@'))
tmp_mat = cons._cons_value
(<PyxConstraintMat[@TYPE@]*>cpp_constraints[i]).parameter =\
&tmp_mat[0,0]
(<PyxConstraintMat[@TYPE@]*>cpp_constraints[i]).parameter_sz =\
......@@ -365,7 +367,8 @@ cdef class FaustAlgoGen@TYPE_NAME@:
elif cons.is_mat_constraint():
cpp_constraints[i] = <PyxConstraintMat[@TYPE@]*> \
PyMem_Malloc(sizeof(PyxConstraintMat[@TYPE@]))
tmp_mat = (cons._cons_value).astype(type2dtype('@TYPE@'))
cons._cons_value = cons._cons_value.astype(type2dtype('@TYPE@'))
tmp_mat = cons._cons_value
(<PyxConstraintMat[@TYPE@]*>cpp_constraints[i]).parameter =\
&tmp_mat[0,0]
(<PyxConstraintMat[@TYPE@]*>cpp_constraints[i]).parameter_sz =\
......@@ -385,7 +388,6 @@ cdef class FaustAlgoGen@TYPE_NAME@:
# algorithm runs on GPU (hence the transform objects F_facts and
# core are not the same)
core = @CORE_CLASS@(core=True)
core.@CORE_OBJ@ = \
FaustCoreCy.palm4msa2020[@TYPE@, @REAL_TYPE@](&Mview[0,0], M_num_rows,
......@@ -507,7 +509,8 @@ cdef class FaustAlgoGen@TYPE_NAME@:
elif(cons.is_mat_constraint()):
cpp_constraints[i] = <PyxConstraintMat[@TYPE@]*> \
PyMem_Malloc(sizeof(PyxConstraintMat[@TYPE@]))
tmp_mat = (cons._cons_value).astype(type2dtype('@TYPE@'))
cons._cons_value = cons._cons_value.astype(type2dtype('@TYPE@'))
tmp_mat = cons._cons_value
(<PyxConstraintMat[@TYPE@]*>cpp_constraints[i]).parameter =\
&tmp_mat[0,0]
(<PyxConstraintMat[@TYPE@]*>cpp_constraints[i]).parameter_sz =\
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment