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
faaf8b20
Commit
faaf8b20
authored
2 years ago
by
hhakim
Browse files
Options
Downloads
Patches
Plain Diff
Add missing prototypes and fix constness in multiply(Vect) of MatButterfly.
parent
756540a9
Branches
Branches containing commit
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_MatButterfly.h
+3
-0
3 additions, 0 deletions
src/faust_linear_operator/CPU/faust_MatButterfly.h
src/faust_linear_operator/CPU/faust_MatButterfly.hpp
+19
-2
19 additions, 2 deletions
src/faust_linear_operator/CPU/faust_MatButterfly.hpp
with
22 additions
and
2 deletions
src/faust_linear_operator/CPU/faust_MatButterfly.h
+
3
−
0
View file @
faaf8b20
...
@@ -60,6 +60,7 @@ namespace Faust
...
@@ -60,6 +60,7 @@ namespace Faust
MatGeneric
<
FPP
,
Cpu
>*
Clone
(
const
bool
isOptimize
=
false
)
const
;
MatGeneric
<
FPP
,
Cpu
>*
Clone
(
const
bool
isOptimize
=
false
)
const
;
void
multiply
(
Vect
<
FPP
,
Cpu
>
&
vec
,
char
opThis
=
'N'
)
const
;
void
multiply
(
Vect
<
FPP
,
Cpu
>
&
vec
,
char
opThis
=
'N'
)
const
;
Vect
<
FPP
,
Cpu
>
multiply
(
const
Vect
<
FPP
,
Cpu
>
&
v
)
const
;
// from LinearOperator
void
multiply
(
MatDense
<
FPP
,
Cpu
>
&
M
,
char
opThis
)
const
;
void
multiply
(
MatDense
<
FPP
,
Cpu
>
&
M
,
char
opThis
)
const
;
void
multiply
(
MatSparse
<
FPP
,
Cpu
>&
M
,
char
opThis
)
const
;
void
multiply
(
MatSparse
<
FPP
,
Cpu
>&
M
,
char
opThis
)
const
;
void
multiplyRight
(
MatSparse
<
FPP
,
Cpu
>
const
&
M
)
;
void
multiplyRight
(
MatSparse
<
FPP
,
Cpu
>
const
&
M
)
;
...
@@ -83,6 +84,8 @@ namespace Faust
...
@@ -83,6 +84,8 @@ namespace Faust
void
setZeros
();
void
setZeros
();
bool
containsNaN
()
const
;
bool
containsNaN
()
const
;
const
FPP
&
operator
()(
faust_unsigned_int
i
,
faust_unsigned_int
j
)
const
;
const
FPP
&
operator
()(
faust_unsigned_int
i
,
faust_unsigned_int
j
)
const
;
void
faust_gemm
(
const
MatDense
<
FPP
,
Cpu
>
&
B
,
MatDense
<
FPP
,
Cpu
>
&
C
,
const
FPP
&
alpha
,
const
FPP
&
beta
,
char
typeA
,
char
typeB
)
const
;
//from LinearOperator
};
};
}
}
...
...
This diff is collapsed.
Click to expand it.
src/faust_linear_operator/CPU/faust_MatButterfly.hpp
+
19
−
2
View file @
faaf8b20
...
@@ -98,13 +98,22 @@ namespace Faust
...
@@ -98,13 +98,22 @@ namespace Faust
}
}
template
<
typename
FPP
>
template
<
typename
FPP
>
void
MatButterfly
<
FPP
,
Cpu
>::
multiply
(
Vect
<
FPP
,
Cpu
>
&
x
,
char
opThis
)
const
Vect
<
FPP
,
Cpu
>
MatButterfly
<
FPP
,
Cpu
>::
multiply
(
const
Vect
<
FPP
,
Cpu
>
&
x
)
const
{
{
Vect
<
FPP
,
Cpu
>
z
(
x
.
size
());
Vect
<
FPP
,
Cpu
>
z
(
x
.
size
());
multiply
(
x
.
getData
(),
z
.
getData
(),
x
.
size
(),
opThis
!=
'N'
);
//TODO: conjugate
const_cast
<
MatButterfly
<
FPP
,
Cpu
>*>
(
this
)
->
multiply
(
x
.
getData
(),
z
.
getData
(),
x
.
size
(),
false
);
//TODO: conjugate
return
z
;
return
z
;
}
}
template
<
typename
FPP
>
void
MatButterfly
<
FPP
,
Cpu
>::
multiply
(
Vect
<
FPP
,
Cpu
>
&
x
,
char
opThis
)
const
{
Vect
<
FPP
,
Cpu
>
z
(
x
.
size
());
const_cast
<
MatButterfly
<
FPP
,
Cpu
>*>
(
this
)
->
multiply
(
x
.
getData
(),
z
.
getData
(),
x
.
size
(),
opThis
!=
'N'
);
//TODO: conjugate
x
=
z
;
}
template
<
typename
FPP
>
template
<
typename
FPP
>
void
MatButterfly
<
FPP
,
Cpu
>::
multiply
(
MatDense
<
FPP
,
Cpu
>
&
M
,
char
opThis
)
const
void
MatButterfly
<
FPP
,
Cpu
>::
multiply
(
MatDense
<
FPP
,
Cpu
>
&
M
,
char
opThis
)
const
{
{
...
@@ -190,6 +199,14 @@ namespace Faust
...
@@ -190,6 +199,14 @@ namespace Faust
#endif
#endif
}
}
template
<
typename
FPP
>
void
MatButterfly
<
FPP
,
Cpu
>::
faust_gemm
(
const
MatDense
<
FPP
,
Cpu
>
&
B
,
MatDense
<
FPP
,
Cpu
>
&
C
,
const
FPP
&
alpha
,
const
FPP
&
beta
,
char
typeA
,
char
typeB
)
const
{
//TODO
}
template
<
typename
FPP
>
template
<
typename
FPP
>
void
MatButterfly
<
FPP
,
Cpu
>::
transpose
()
void
MatButterfly
<
FPP
,
Cpu
>::
transpose
()
{
{
...
...
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