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
Iterations
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
Eclipse Projects
aidge
aidge_core
Commits
e8192f3f
Commit
e8192f3f
authored
1 year ago
by
Maxence Naud
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/main' into tiling
parents
c8d3a3e4
ec236310
No related branches found
No related tags found
1 merge request
!54
horizontal tiling
Pipeline
#35117
failed
1 year ago
Stage: static_analysis
Stage: build
Stage: test
Stage: coverage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/aidge/graph/Node.hpp
+0
-7
0 additions, 7 deletions
include/aidge/graph/Node.hpp
src/graphRegex/matchFsm/FsmEdge.cpp
+10
-10
10 additions, 10 deletions
src/graphRegex/matchFsm/FsmEdge.cpp
with
10 additions
and
17 deletions
include/aidge/graph/Node.hpp
+
0
−
7
View file @
e8192f3f
...
...
@@ -163,13 +163,6 @@ public:
return
std
::
pair
<
NodePtr
,
IOIndex_t
>
(
mParents
[
inID
],
mIdOutParents
[
inID
]);
}
/**
* @brief Set fix value for the specified input by creating a Producer wrapping the given Tensor.
*
* @param idx Input index.
* @param tensor Constant Tensor to add as parent for specified index.
*/
// void setInput(const IOIndex_t idx, const std::shared_ptr<Tensor> tensor);
/**
* @brief Get the lowest index in the InputData Parent list equal to the
...
...
This diff is collapsed.
Click to expand it.
src/graphRegex/matchFsm/FsmEdge.cpp
+
10
−
10
View file @
e8192f3f
...
...
@@ -42,7 +42,7 @@ void FsmEdge::reSetDestNode(const std::shared_ptr<FsmNode>& newDest){
}
void
FsmEdge
::
propagateRelativePos
(
void
){
std
::
set
<
in
t
>
myRelativeID
;
std
::
set
<
std
::
size_
t
>
myRelativeID
;
for
(
const
auto
&
kvp
:
mRelativePos
)
{
myRelativeID
.
insert
(
kvp
.
first
);
}
...
...
@@ -56,31 +56,31 @@ void FsmEdge::propagateRelativePos(void){
}
std
::
set
<
in
t
>
nextRelativeID
;
std
::
set
<
std
::
size_
t
>
nextRelativeID
;
for
(
const
auto
&
kvp
:
nextEdge
->
getRelative
())
{
nextRelativeID
.
insert
(
kvp
.
first
);
}
// Find elements in myRelativeID but not in nextRelativeID
std
::
set
<
in
t
>
idxsToPush
;
std
::
set
<
std
::
size_
t
>
idxsToPush
;
std
::
set_difference
(
myRelativeID
.
begin
(),
myRelativeID
.
end
(),
nextRelativeID
.
begin
(),
nextRelativeID
.
end
(),
std
::
inserter
(
idxsToPush
,
idxsToPush
.
begin
()));
// Find elements in nextRelativeID but not in myRelativeID
std
::
set
<
in
t
>
idxsToGet
;
std
::
set
<
std
::
size_
t
>
idxsToGet
;
std
::
set_difference
(
nextRelativeID
.
begin
(),
nextRelativeID
.
end
(),
myRelativeID
.
begin
(),
myRelativeID
.
end
(),
std
::
inserter
(
idxsToGet
,
idxsToGet
.
begin
()));
// test for integrity we look if 2 edge refer
t
to the sam
m
e
// test for integrity we look if 2 edge refer to the same
// ref and are link the ref dif is one
// not working for common node
// we can go deeper by find the all pass to a ref and see if the delta is good
// Find elements present in both myRelativeID and nextRelativeID
std
::
set
<
in
t
>
idxsTotest
;
for
(
int
idx
:
nextRelativeID
){
std
::
set
<
std
::
size_
t
>
idxsTotest
;
for
(
auto
idx
:
nextRelativeID
){
if
(
myRelativeID
.
find
(
idx
)
!=
myRelativeID
.
end
()){
if
(
std
::
abs
(
getRelative
().
at
(
idx
)
-
nextEdge
->
getRelative
().
at
(
idx
))
!=
1
)
{
throw
std
::
runtime_error
(
"Bad relative"
);
...
...
@@ -90,10 +90,10 @@ void FsmEdge::propagateRelativePos(void){
// this e
g
de have more relative info than the next
// this ed
g
e have more relative info than the next
std
::
map
<
size_t
,
int
>
tmpRelative
;
// we push this info to the next
for
(
auto
idxToPush
:
idxsToPush
){
for
(
auto
idxToPush
:
idxsToPush
){
tmpRelative
.
insert
(
std
::
make_pair
(
idxToPush
,
getRelative
().
at
(
idxToPush
)
+
1
));
}
if
(
tmpRelative
.
size
()
!=
0
){
...
...
@@ -104,7 +104,7 @@ void FsmEdge::propagateRelativePos(void){
// the next node have more info than me i need to get it
for
(
auto
idxToGet
:
idxsToGet
){
for
(
auto
idxToGet
:
idxsToGet
){
tmpRelative
.
insert
(
std
::
make_pair
(
idxToGet
,
nextEdge
->
getRelative
().
at
(
idxToGet
)
-
1
));
}
if
(
tmpRelative
.
size
()
!=
0
){
...
...
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