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
9266ea7b
Commit
9266ea7b
authored
3 years ago
by
hhakim
Browse files
Options
Downloads
Patches
Plain Diff
Update Vect::multiplyLeft to handle adjoint matrix case.
parent
95ad86dc
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_Vect.h
+2
-0
2 additions, 0 deletions
src/faust_linear_operator/CPU/faust_Vect.h
src/faust_linear_operator/CPU/faust_Vect.hpp
+8
-4
8 additions, 4 deletions
src/faust_linear_operator/CPU/faust_Vect.hpp
with
10 additions
and
4 deletions
src/faust_linear_operator/CPU/faust_Vect.h
+
2
−
0
View file @
9266ea7b
...
...
@@ -100,6 +100,7 @@ namespace Faust
template
<
typename
FPP
,
FDevice
DEVICE
>
class
Transform
;
template
<
typename
FPP
>
class
TransformHelperPoly
;
template
<
typename
FPP
,
FDevice
DEVICE
>
class
TransformHelper
;
...
...
@@ -117,6 +118,7 @@ namespace Faust
friend
class
MatBSR
<
FPP
,
Cpu
>
;
friend
TransformHelperPoly
<
FPP
>
;
// TODO: limit to needed member functions only
friend
TransformHelper
<
FPP
,
Cpu
>
;
// TODO: limit to needed member functions only (sliceMultiply at least)
public
:
Vect
()
:
dim
(
0
),
vec
()
{}
...
...
This diff is collapsed.
Click to expand it.
src/faust_linear_operator/CPU/faust_Vect.hpp
+
8
−
4
View file @
9266ea7b
...
...
@@ -297,10 +297,9 @@ void Faust::Vect<FPP,Cpu>::multiplyLeft(Faust::MatDense<FPP,Cpu> const& A)
template
<
typename
FPP
>
void
Faust
::
Vect
<
FPP
,
Cpu
>::
multiplyLeft
(
Faust
::
MatSparse
<
FPP
,
Cpu
>
const
&
S
,
const
char
transS
)
{
faust_unsigned_int
nbColOpS
,
nbRowOpS
;
faust_unsigned_int
nbColOpS
,
nbRowOpS
;
S
.
setOp
(
transS
,
nbRowOpS
,
nbColOpS
);
if
(
nbColOpS
!=
vec
.
size
())
{
handleError
(
m_className
,
"multiplyLeft : incorrect dimensions"
);
...
...
@@ -312,8 +311,13 @@ void Faust::Vect<FPP,Cpu>::multiplyLeft(Faust::MatSparse<FPP,Cpu> const& S,cons
#endif
if
(
transS
==
'N'
)
vec
=
S
.
mat
*
vec
;
else
if
(
transS
==
'T'
)
vec
=
S
.
mat
.
transpose
()
*
vec
;
else
if
(
transS
==
'H'
)
vec
=
S
.
mat
.
adjoint
()
*
vec
;
else
vec
=
S
.
mat
.
transpose
()
*
vec
;
throw
std
::
runtime_error
(
"Unknown op transS"
);
#ifdef __COMPILE_TIMERS__
t_local_multiplyLeft
.
stop
();
//std::cout <<"0 "<<setprecision(10)<<t_local_multiplyLeft.get_time()<<std::endl;
...
...
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