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
92738e81
Commit
92738e81
authored
1 year ago
by
Maxence Naud
Browse files
Options
Downloads
Patches
Plain Diff
Remove deprecated function 'updateInputsOutputsNodes_DEPRECATED()'
parent
928ea252
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/aidge/graph/GraphView.hpp
+0
-8
0 additions, 8 deletions
include/aidge/graph/GraphView.hpp
src/graph/GraphView.cpp
+0
-34
0 additions, 34 deletions
src/graph/GraphView.cpp
unit_tests/graph/Test_GraphView.cpp
+1
-16
1 addition, 16 deletions
unit_tests/graph/Test_GraphView.cpp
with
1 addition
and
58 deletions
include/aidge/graph/GraphView.hpp
+
0
−
8
View file @
92738e81
...
...
@@ -451,14 +451,6 @@ public:
*/
IOIndex_t
getNbFreeDataInputs
()
const
;
protected
:
/**
* @brief Update inputs/outputs of the GraphView, with no particular order.
* This function DOES NOT preserve inputs/outputs order and should NOT BE USED.
* It is here only to leave time to adapt the replace() function.
*/
void
updateInputsOutputsNodes_DEPRECATED
();
private
:
///////////////////////////////////////////////////////
// TENSOR MANAGEMENT
...
...
This diff is collapsed.
Click to expand it.
src/graph/GraphView.cpp
+
0
−
34
View file @
92738e81
...
...
@@ -1040,40 +1040,6 @@ void Aidge::GraphView::updateInputsOutputsDelete(std::shared_ptr<Node> deletedNo
}
}
void
Aidge
::
GraphView
::
updateInputsOutputsNodes_DEPRECATED
()
{
mInputNodes
.
clear
();
for
(
const
std
::
shared_ptr
<
Node
>&
go_ptr
:
mNodes
)
{
IOIndex_t
inputIdx
=
0
;
for
(
const
std
::
shared_ptr
<
Node
>&
pa_ptr
:
go_ptr
->
getParents
())
{
if
((
pa_ptr
==
nullptr
)
||
(
mNodes
.
find
(
pa_ptr
)
==
mNodes
.
end
()))
{
// Parent doesn't exist || Parent not in the graph
mInputNodes
.
push_back
(
std
::
make_pair
(
go_ptr
,
inputIdx
));
}
++
inputIdx
;
}
}
mOutputNodes
.
clear
();
for
(
const
std
::
shared_ptr
<
Node
>&
go_ptr
:
mNodes
)
{
IOIndex_t
outputIdx
=
0
;
for
(
auto
orderedChilds
:
go_ptr
->
getOrderedChildren
())
{
bool
noInsideConnection
=
true
;
for
(
auto
ch_ptr
:
orderedChilds
)
{
if
(
mNodes
.
find
(
ch_ptr
)
!=
mNodes
.
end
())
{
noInsideConnection
=
false
;
break
;
}
}
if
(
noInsideConnection
)
{
mOutputNodes
.
push_back
(
std
::
make_pair
(
go_ptr
,
outputIdx
));
}
++
outputIdx
;
}
}
}
std
::
shared_ptr
<
Aidge
::
GraphView
>
Aidge
::
GraphView
::
cloneCallback
(
NodePtr
(
*
cloneNode
)(
NodePtr
))
const
{
std
::
shared_ptr
<
GraphView
>
newGraph
=
std
::
make_shared
<
GraphView
>
(
mName
);
...
...
This diff is collapsed.
Click to expand it.
unit_tests/graph/Test_GraphView.cpp
+
1
−
16
View file @
92738e81
...
...
@@ -28,19 +28,6 @@
using
namespace
Aidge
;
class
GraphView_Test
:
public
GraphView
{
public:
GraphView_Test
(
std
::
string
name
=
""
)
:
GraphView
(
name
)
{
// ctor
}
void
updateInputsOutputsNodes_DEPRECATED_Test
()
{
GraphView
::
updateInputsOutputsNodes_DEPRECATED
();
}
};
TEST_CASE
(
"genRandomGraph"
,
"[GraphView][randomGen]"
)
{
const
size_t
nbTests
=
100
;
size_t
nbUnicity
=
0
;
...
...
@@ -50,7 +37,7 @@ TEST_CASE("genRandomGraph", "[GraphView][randomGen]") {
const
std
::
mt19937
::
result_type
seed
(
rd
());
RandomGraph
randGraph
;
const
auto
g1
=
std
::
make_shared
<
GraphView
_Test
>
(
"g1"
);
const
auto
g1
=
std
::
make_shared
<
GraphView
>
(
"g1"
);
const
bool
unicity1
=
g1
->
add
(
randGraph
.
gen
(
seed
,
10
));
const
auto
g2
=
std
::
make_shared
<
GraphView
>
(
"g2"
);
const
bool
unicity2
=
g2
->
add
(
randGraph
.
gen
(
seed
,
10
));
...
...
@@ -68,8 +55,6 @@ TEST_CASE("genRandomGraph", "[GraphView][randomGen]") {
REQUIRE
(
nodePtrTo
(
g1
->
outputNodes
(),
nodePtrToName
)
==
nodePtrTo
(
g2
->
outputNodes
(),
nodePtrToName
));
++
nbUnicity
;
// Test deprecated function
g1
->
updateInputsOutputsNodes_DEPRECATED_Test
();
// Check that inputs/outputs are the same regardless of the order
auto
orderedInputs1
=
nodePtrTo
(
g1
->
getOrderedInputs
(),
nodePtrToName
);
auto
orderedInputs2
=
nodePtrTo
(
g2
->
getOrderedInputs
(),
nodePtrToName
);
...
...
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