Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
aidge_core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Cyril Moineau
aidge_core
Commits
0a88775b
Commit
0a88775b
authored
1 year ago
by
Maxence Naud
Browse files
Options
Downloads
Patches
Plain Diff
[Fix] 'keepDim' variable
parent
24e2dec1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/operator/MatMul.cpp
+10
-6
10 additions, 6 deletions
src/operator/MatMul.cpp
with
10 additions
and
6 deletions
src/operator/MatMul.cpp
+
10
−
6
View file @
0a88775b
...
...
@@ -32,6 +32,11 @@ void Aidge::MatMul_Op::computeOutputDims() {
std
::
vector
<
std
::
size_t
>
dims0
=
getInput
(
0
)
->
dims
();
std
::
vector
<
std
::
size_t
>
dims1
=
getInput
(
1
)
->
dims
();
// keep second-to-last dimension of dims0
const
bool
keepDim0
=
dims0
.
size
()
>
1
;
// keep last dimension of dims1
const
bool
keepDim1
=
dims1
.
size
()
>
1
;
if
(
dims0
.
size
()
==
1
)
{
dims0
.
insert
(
dims0
.
cbegin
(),
1
);
}
...
...
@@ -42,10 +47,10 @@ void Aidge::MatMul_Op::computeOutputDims() {
if
(
dims0
.
size
()
>
dims1
.
size
())
{
dims1
.
insert
(
dims1
.
cbegin
(),
dims0
.
begin
(),
dims0
.
end
()
-
dims1
.
size
());
dims1
.
insert
(
dims1
.
cbegin
(),
dims0
.
begin
(),
dims0
.
end
()
-
dims1
.
size
());
}
else
if
(
dims1
.
size
()
>
dims0
.
size
())
{
dims0
.
insert
(
dims0
.
cbegin
(),
dims1
.
begin
(),
dims1
.
end
()
-
dims0
.
size
());
dims0
.
insert
(
dims0
.
cbegin
(),
dims1
.
begin
(),
dims1
.
end
()
-
dims0
.
size
());
}
AIDGE_ASSERT
(
dims0
[
dims_size
-
1
]
==
dims1
[
dims_size
-
2
],
"Incompatible matrices sizes."
);
...
...
@@ -56,11 +61,10 @@ void Aidge::MatMul_Op::computeOutputDims() {
outDims
[
i
]
=
std
::
max
(
dims0
[
i
],
dims1
[
i
]);
}
//
keep second-to-last dimension of dims0
if
(
dims0
.
size
()
>
1
)
//
use keepDim0 instead of dims0.size() because dims0 has been modified
if
(
keepDim0
)
outDims
.
push_back
(
dims0
[
dims_size
-
2
]);
// keep last dimension of dims1
if
(
dims1
.
size
()
>
1
)
if
(
keepDim1
)
outDims
.
push_back
(
dims1
[
dims_size
-
1
]);
mOutputs
[
0
]
->
resize
(
outDims
);
...
...
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