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
Admin message
GitLab upgrade completed. Current version is 17.11.4.
Show more breadcrumbs
faust group
faust
Commits
ce9b80ec
Commit
ce9b80ec
authored
2 years ago
by
hhakim
Browse files
Options
Downloads
Patches
Plain Diff
Make MatGeneric::getNbRow/NbCol virtual in order to override them in MatButterfly.
parent
320f11bb
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_MatButterfly.h
+3
-0
3 additions, 0 deletions
src/faust_linear_operator/CPU/faust_MatButterfly.h
src/faust_linear_operator/faust_MatGeneric.h
+2
-2
2 additions, 2 deletions
src/faust_linear_operator/faust_MatGeneric.h
with
5 additions
and
2 deletions
src/faust_linear_operator/CPU/faust_MatButterfly.h
+
3
−
0
View file @
ce9b80ec
...
...
@@ -51,6 +51,9 @@ namespace Faust
void
init_transpose
();
void
Display
()
const
;
faust_unsigned_int
getNbRow
()
const
{
return
D1
.
rows
();};
faust_unsigned_int
getNbCol
()
const
{
return
D1
.
cols
();};
void
multiply
(
const
FPP
*
x
,
FPP
*
y
,
size_t
size
,
bool
transpose
=
false
);
void
multiply
(
const
FPP
*
A
,
int
A_ncols
,
FPP
*
C
,
size_t
size
,
bool
transpose
=
false
);
...
...
This diff is collapsed.
Click to expand it.
src/faust_linear_operator/faust_MatGeneric.h
+
2
−
2
View file @
ce9b80ec
...
...
@@ -90,10 +90,10 @@ namespace Faust
void
setOp
(
const
char
op
,
faust_unsigned_int
&
nbRowOp
,
faust_unsigned_int
&
nbColOp
)
const
;
//! \brief return the number of rows of (*this)
faust_unsigned_int
getNbRow
()
const
{
return
dim1
;}
virtual
faust_unsigned_int
getNbRow
()
const
{
return
dim1
;}
//! \brief return the number of column of (*this)
faust_unsigned_int
getNbCol
()
const
{
return
dim2
;}
virtual
faust_unsigned_int
getNbCol
()
const
{
return
dim2
;}
//! \brief resize (*this)
//! \param dim1_ : new number of rows
...
...
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