Skip to content
Snippets Groups Projects
Commit 7f304045 authored by Cyril Moineau's avatar Cyril Moineau Committed by Olivier BICHLER
Browse files

Update remove flatten tests.

parent 2659ce34
No related branches found
No related tags found
2 merge requests!212Version 0.3.0,!189Improve Remove Flatten
...@@ -175,18 +175,17 @@ TEST_CASE("GraphRegexUser") { ...@@ -175,18 +175,17 @@ TEST_CASE("GraphRegexUser") {
matmul1->addChild(add1, 0, 0); matmul1->addChild(add1, 0, 0);
b1->addChild(add1, 0, 1); b1->addChild(add1, 0, 1);
auto fc = GenericOperator("FC", 1, 0, 1, "c"); auto fc = GenericOperator("FC", 1, 0, 1, "fc1");
auto fl = GenericOperator("Flatten", 1, 0, 1, "c"); auto fl = GenericOperator("Flatten", 1, 0, 1, "flatten0");
add1->addChild(fl, 0, 0);
fl->addChild(fc, 0, 0);
auto g = std::make_shared<GraphView>(); auto g = std::make_shared<GraphView>();
g->add({w0, matmul0, b0, add0, w1, matmul1, b1, add1,fl,fc}); g->add({w0, matmul0, b0, add0, w1, matmul1, b1, add1, fl, fc});
matMulToFC(g); matMulToFC(g);
removeFlatten(g); removeFlatten(g);
std::set<std::shared_ptr<Node>> newNodes = g->getNodes(); std::set<std::shared_ptr<Node>> newNodes = g->getNodes();
REQUIRE(newNodes != std::set<std::shared_ptr<Node>>({w0, matmul0, b0, add0, w1, matmul1, b1, add1,fc})); REQUIRE(newNodes != std::set<std::shared_ptr<Node>>({w0, matmul0, b0, add0, w1, matmul1, b1, add1,fl,fc}));
//REQUIRE(newNodes.size() == 6); //REQUIRE(newNodes.size() == 6);
......
...@@ -42,7 +42,7 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { ...@@ -42,7 +42,7 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
CHECK(g->getOrderedInputs().size() == 1); CHECK(g->getOrderedInputs().size() == 1);
CHECK(g->getOrderedInputs()[0].first == fc0); CHECK(g->getOrderedInputs()[0].first == fc0);
CHECK(fc0->getParent(0) == nullptr); CHECK(fc0->getParent(0) == nullptr);
CHECK(fc0->getChildren(0).size() == 1); CHECK(fc0->getChildren(0).size() == 1);
CHECK(g->rootNode() == fc0); CHECK(g->rootNode() == fc0);
...@@ -54,10 +54,10 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { ...@@ -54,10 +54,10 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
CHECK(g->getOrderedInputs().size() == 1); CHECK(g->getOrderedInputs().size() == 1);
CHECK(g->getOrderedInputs()[0].first == fc0); CHECK(g->getOrderedInputs()[0].first == fc0);
CHECK(g->getOrderedOutputs().size() == 1); CHECK(g->getOrderedOutputs().size() == 1);
CHECK(g->getOrderedOutputs()[0].first == fc0); CHECK(g->getOrderedOutputs()[0].first == fc0);
CHECK(fc0->getParent(0) == nullptr); CHECK(fc0->getParent(0) == nullptr);
CHECK(fc0->getChildren(0).size() == 0); CHECK(fc0->getChildren(0).size() == 0);
CHECK(g->rootNode() == fc0); CHECK(g->rootNode() == fc0);
...@@ -73,7 +73,7 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { ...@@ -73,7 +73,7 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
CHECK(g->getOrderedOutputs().size() == 1); CHECK(g->getOrderedOutputs().size() == 1);
CHECK(g->getOrderedOutputs()[0].first == fc1); CHECK(g->getOrderedOutputs()[0].first == fc1);
CHECK(fc1->getParent(0) == fc0); CHECK(fc1->getParent(0) == fc0);
CHECK(fc0->getChildren(0)[0] == fc1); CHECK(fc0->getChildren(0)[0] == fc1);
CHECK(g->rootNode() == fc0); CHECK(g->rootNode() == fc0);
...@@ -87,10 +87,10 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { ...@@ -87,10 +87,10 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
removeFlatten(g); removeFlatten(g);
CHECK(g->getOrderedInputs().size() == 0); CHECK(g->getOrderedInputs().size() == 0);
CHECK(g->getOrderedOutputs().size() == 1); CHECK(g->getOrderedOutputs().size() == 1);
CHECK(g->getOrderedOutputs()[0].first == fc0); CHECK(g->getOrderedOutputs()[0].first == fc0);
CHECK(fc0->getParent(0) == prod); CHECK(fc0->getParent(0) == prod);
CHECK(fc0->getChildren(0).size() == 0); CHECK(fc0->getChildren(0).size() == 0);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment