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
4e00125c
Commit
4e00125c
authored
9 years ago
by
Nicolas Bellot
Committed by
hhakim
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
bug (resolu) transpose matlab mais (A'*x) lent par rapport a (trans_A=A';trans_A*x
parent
bf381fe6
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
misc/demo/tools/greed_omp_chol.m
+1
-1
1 addition, 1 deletion
misc/demo/tools/greed_omp_chol.m
wrapper/matlab/src/mexFaust.cpp
+4
-10
4 additions, 10 deletions
wrapper/matlab/src/mexFaust.cpp
with
5 additions
and
11 deletions
misc/demo/tools/greed_omp_chol.m
+
1
−
1
View file @
4e00125c
...
@@ -217,7 +217,7 @@ end
...
@@ -217,7 +217,7 @@ end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
if
isa
(
A
,
'float'
)
P
=@
(
z
)
A
*
z
;
Pt
=@
(
z
)
A
'*
z
;
if
isa
(
A
,
'float'
)
P
=@
(
z
)
A
*
z
;
Pt
=@
(
z
)
A
'*
z
;
elseif
isobject
(
A
)
P
=@
(
z
)
A
*
z
;
Pt
=@
(
z
)
A
'*
z
;
elseif
isobject
(
A
)
P
=@
(
z
)
A
*
z
;
trans_A
=
A
'
;
Pt
=@
(
z
)
trans_A
*
z
;
%% modification nicolas bellot
elseif
isa
(
A
,
'function_handle'
)
elseif
isa
(
A
,
'function_handle'
)
try
try
if
isa
(
Pt
,
'function_handle'
);
P
=
A
;
if
isa
(
Pt
,
'function_handle'
);
P
=
A
;
...
...
This diff is collapsed.
Click to expand it.
wrapper/matlab/src/mexFaust.cpp
+
4
−
10
View file @
4e00125c
...
@@ -52,9 +52,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
...
@@ -52,9 +52,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
std
::
vector
<
Faust
::
MatSparse
<
FFPP
,
Cpu
>
>
vec_spmat
;
std
::
vector
<
Faust
::
MatSparse
<
FFPP
,
Cpu
>
>
vec_spmat
;
mwSize
nb_element
=
mxGetNumberOfElements
(
prhs
[
1
]);
mwSize
nb_element
=
mxGetNumberOfElements
(
prhs
[
1
]);
if
(
nb_element
==
0
)
if
(
nb_element
!=
0
)
mexWarnMsgTxt
(
"Empty cell array."
);
else
{
{
mxArray
*
mxMat
;
mxArray
*
mxMat
;
for
(
int
i
=
0
;
i
<
nb_element
;
i
++
)
for
(
int
i
=
0
;
i
<
nb_element
;
i
++
)
...
@@ -132,13 +130,9 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
...
@@ -132,13 +130,9 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
{
{
// if (nlhs != 1)
// {
if
(
nlhs
>
1
)
// (*core_ptr).transpose();
mexErrMsgTxt
(
"transpose : too much output argument"
);
// }
// return;
if
(
nlhs
!=
1
)
(
*
core_ptr
).
transpose
();
else
else
{
{
Faust
::
Transform
<
FFPP
,
Cpu
>*
F
=
new
Faust
::
Transform
<
FFPP
,
Cpu
>
((
*
core_ptr
));
Faust
::
Transform
<
FFPP
,
Cpu
>*
F
=
new
Faust
::
Transform
<
FFPP
,
Cpu
>
((
*
core_ptr
));
...
...
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