Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
faust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
faust group
faust
Commits
7d155e21
Commit
7d155e21
authored
3 years ago
by
hhakim
Browse files
Options
Downloads
Patches
Plain Diff
Handle complex conjugate and adjoint in sliceMultiply C++ core and pyfaust wrapper.
parent
1b987e23
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/faust_linear_operator/CPU/faust_TransformHelper.hpp
+64
-16
64 additions, 16 deletions
src/faust_linear_operator/CPU/faust_TransformHelper.hpp
wrapper/python/src/_FaustCoreGen.pyx.in
+2
-2
2 additions, 2 deletions
wrapper/python/src/_FaustCoreGen.pyx.in
with
66 additions
and
18 deletions
src/faust_linear_operator/CPU/faust_TransformHelper.hpp
+
64
−
16
View file @
7d155e21
...
...
@@ -1796,6 +1796,7 @@ FPP* Faust::TransformHelper<FPP,Cpu>::sliceMultiply(const Slice s[2], const FPP*
MatMap
out_map
(
out
,
s
[
0
].
size
(),
X_ncols
);
FPP
*
tmp_ptr
;
int
tmp_nrows
;
if
(
size
()
==
1
)
{
// might be row and column slicing on the right factor
...
...
@@ -1819,17 +1820,29 @@ FPP* Faust::TransformHelper<FPP,Cpu>::sliceMultiply(const Slice s[2], const FPP*
{
// 1.2 multiply the slice of the factor by the slice of the vector
if
(
size
()
==
1
)
out_map
=
ds_fac
->
mat
.
transpose
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
if
(
this
->
is_conjugate
)
out_map
=
ds_fac
->
mat
.
adjoint
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
out_map
=
ds_fac
->
mat
.
transpose
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
M
=
ds_fac
->
mat
.
transpose
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
if
(
this
->
is_conjugate
)
M
=
ds_fac
->
mat
.
adjoint
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
M
=
ds_fac
->
mat
.
transpose
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
}
else
if
(
sp_fac
=
dynamic_cast
<
MatSparse
<
FPP
,
Cpu
>*>
(
gen_first_fac
))
{
// 1.2 multiply the slice of the factor by the slice of the vector
if
(
size
()
==
1
)
out_map
=
sp_fac
->
mat
.
transpose
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
if
(
this
->
is_conjugate
)
out_map
=
sp_fac
->
mat
.
adjoint
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
out_map
=
sp_fac
->
mat
.
transpose
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
M
=
sp_fac
->
mat
.
transpose
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
if
(
this
->
is_conjugate
)
M
=
sp_fac
->
mat
.
adjoint
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
M
=
sp_fac
->
mat
.
transpose
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
}
else
{
...
...
@@ -1854,7 +1867,11 @@ FPP* Faust::TransformHelper<FPP,Cpu>::sliceMultiply(const Slice s[2], const FPP*
}
TransformHelper
<
FPP
,
Cpu
>
sub_th
(
other_facs
,
(
FPP
)
1.0
,
/* opt_copy */
false
,
/* cloning */
false
,
/* internal call */
true
);
// 3. finally multiply this new Faust by M and return the result
auto
sub_th_t
=
sub_th
.
transpose
();
TransformHelper
<
FPP
,
Cpu
>
*
sub_th_t
;
if
(
this
->
is_conjugate
)
sub_th_t
=
sub_th
.
adjoint
();
else
sub_th_t
=
sub_th
.
transpose
();
sub_th_t
->
multiply
(
M
.
data
(),
M
.
cols
(),
tmp_ptr
);
delete
sub_th_t
;
}
...
...
@@ -1866,17 +1883,29 @@ FPP* Faust::TransformHelper<FPP,Cpu>::sliceMultiply(const Slice s[2], const FPP*
{
// 1.2 multiply the slice of the factor by the slice of the vector
if
(
size
()
==
1
)
out_map
=
ds_fac
->
mat
.
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
if
(
this
->
is_conjugate
)
out_map
=
ds_fac
->
mat
.
conjugate
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
out_map
=
ds_fac
->
mat
.
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
M
=
ds_fac
->
mat
.
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
if
(
this
->
is_conjugate
)
M
=
ds_fac
->
mat
.
conjugate
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
M
=
ds_fac
->
mat
.
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
}
else
if
(
sp_fac
=
dynamic_cast
<
MatSparse
<
FPP
,
Cpu
>*>
(
gen_last_fac
))
{
// 1.2 multiply the slice of the factor by the slice of the vector
if
(
size
()
==
1
)
out_map
=
sp_fac
->
mat
.
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
if
(
this
->
is_conjugate
)
out_map
=
sp_fac
->
mat
.
conjugate
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
out_map
=
sp_fac
->
mat
.
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
M
=
sp_fac
->
mat
.
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
if
(
this
->
is_conjugate
)
M
=
sp_fac
->
mat
.
conjugate
().
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
else
M
=
sp_fac
->
mat
.
block
(
rf_row_offset
,
s1
.
start_id
,
rf_nrows
,
s1
.
size
())
*
X_map
;
}
else
{
...
...
@@ -1899,25 +1928,38 @@ FPP* Faust::TransformHelper<FPP,Cpu>::sliceMultiply(const Slice s[2], const FPP*
other_facs
.
assign
(
this
->
transform
->
begin
(),
this
->
transform
->
end
()
-
1
);
tmp_ptr
=
out
;
}
TransformHelper
<
FPP
,
Cpu
>
sub_th
(
other_facs
,
(
FPP
)
1.0
,
/* opt_copy */
false
,
/* cloning */
false
,
/* internal call */
true
);
// 3. finally multiply this new Faust by M and return the result
sub_th
.
multiply
(
M
.
data
(),
M
.
cols
(),
tmp_ptr
);
TransformHelper
<
FPP
,
Cpu
>
sub_th
(
other_facs
,
(
FPP
)
1.0
,
/* opt_copy */
false
,
/* cloning */
false
,
/* internal call */
true
);
if
(
this
->
is_conjugate
)
{
auto
sub_th_c
=
sub_th
.
conjugate
();
sub_th_c
->
multiply
(
M
.
data
(),
M
.
cols
(),
tmp_ptr
);
delete
sub_th_c
;
}
else
sub_th
.
multiply
(
M
.
data
(),
M
.
cols
(),
tmp_ptr
);
}
if
(
left_sliced_factor
!=
nullptr
)
{
MatMap
tmp_map
(
tmp_ptr
,
tmp_nrows
,
X_ncols
);
// slice left factor too
MatMap
tmp_map
(
tmp_ptr
,
tmp_nrows
,
X_ncols
);
if
(
ds_fac
=
dynamic_cast
<
MatDense
<
FPP
,
Cpu
>*>
(
left_sliced_factor
))
{
// 1.2 multiply the slice of the factor by mat
Mat
tmp
;
if
(
this
->
is_transposed
)
{
tmp
=
ds_fac
->
mat
.
transpose
();
if
(
this
->
is_conjugate
)
tmp
=
ds_fac
->
mat
.
adjoint
();
else
tmp
=
ds_fac
->
mat
.
transpose
();
}
else
{
tmp
=
ds_fac
->
mat
;
if
(
this
->
is_conjugate
)
tmp
=
ds_fac
->
mat
.
conjugate
();
else
tmp
=
ds_fac
->
mat
;
}
out_map
=
tmp
.
block
(
s0
.
start_id
,
0
,
s0
.
size
(),
tmp
.
cols
())
*
tmp_map
;
}
...
...
@@ -1926,9 +1968,15 @@ FPP* Faust::TransformHelper<FPP,Cpu>::sliceMultiply(const Slice s[2], const FPP*
// 1.2 multiply the slice of the factor by mat
Eigen
::
SparseMatrix
<
FPP
,
Eigen
::
RowMajor
>
tmp
;
if
(
this
->
is_transposed
)
tmp
=
sp_fac
->
mat
.
transpose
();
if
(
this
->
is_conjugate
)
tmp
=
sp_fac
->
mat
.
adjoint
();
else
tmp
=
sp_fac
->
mat
.
transpose
();
else
tmp
=
sp_fac
->
mat
;
if
(
this
->
is_conjugate
)
tmp
=
sp_fac
->
mat
.
conjugate
();
else
tmp
=
sp_fac
->
mat
;
out_map
=
tmp
.
block
(
s0
.
start_id
,
0
,
s0
.
size
(),
tmp
.
cols
())
*
tmp_map
;
}
else
...
...
This diff is collapsed.
Click to expand it.
wrapper/python/src/_FaustCoreGen.pyx.in
+
2
−
2
View file @
7d155e21
...
...
@@ -124,11 +124,11 @@ cdef class FaustCoreGen@TYPE_NAME@@PROC@:
def colSliceMultiply(self, col_start_id, col_end_id, x):
cdef @TYPE@ [:] x_data
cdef @TYPE@ [:] y_data
x_data = x.data
x_data = x.
astype(type2dtype('@TYPE@')).
data
nbrow = self.@CORE_OBJ@.getNbRow()
if(col_end_id-col_start_id != x.size): raise ValueError("Dimensions"
" must agree")
y_data_arr = np.empty((nbrow), dtype=
np.
@TYPE@, order='F') # we don't know beforehand Y nnz
y_data_arr = np.empty((nbrow), dtype=
type2dtype('
@TYPE@
')
, order='F') # we don't know beforehand Y nnz
y_data = y_data_arr
self.@CORE_OBJ@.colSliceMultiply(col_start_id, col_end_id, &x_data[0], 1, &y_data[0])
return y_data_arr
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment