Merge branch 'feat/operator_globalAveragePooling' of...

Merge branch 'feat/operator_globalAveragePooling' of gitlab.eclipse.org:hrouis/aidge_core into feat/operator_globalAveragePooling

CMakeLists.txt

@@ -11,6 +11,7 @@ set(module_name _${project}) # target name
 
 
 project(${project})
+set(CXX_STANDARD 14)
 
 ##############################################
 # Define options

src/recipes/RemoveFlatten.cpp

@@ -22,7 +22,6 @@
 
 namespace Aidge {
     void removeFlatten(std::shared_ptr<Node> flatten) {
- 
         GraphView::replace({flatten}, {});
     }
 

unit_tests/recipes/Test_removeFlatten.cpp

@@ -37,10 +37,12 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
 
     removeFlatten(g);
 
-    CHECK(g->getOrderedInputs().size() == 1);
     CHECK(g->getOrderedOutputs().size() == 1);
-    CHECK(g->getOrderedInputs()[0].first == fc0);
     CHECK(g->getOrderedOutputs()[0].first == flatten);
+
+    CHECK(g->getOrderedInputs().size() == 1);
+    CHECK(g->getOrderedInputs()[0].first == fc0);
+    
     CHECK(fc0->getParent(0) == nullptr);
     CHECK(fc0->getChildren(0).size() == 1);
     CHECK(g->getRootNode() == fc0);
@@ -51,9 +53,11 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
     removeFlatten(g);
 
     CHECK(g->getOrderedInputs().size() == 1);
-    CHECK(g->getOrderedOutputs().size() == 1);
     CHECK(g->getOrderedInputs()[0].first == fc0);
+    
+    CHECK(g->getOrderedOutputs().size() == 1);
     CHECK(g->getOrderedOutputs()[0].first == fc0);
+    
     CHECK(fc0->getParent(0) == nullptr);
     CHECK(fc0->getChildren(0).size() == 0);
     CHECK(g->getRootNode() == fc0);
@@ -65,9 +69,11 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
     removeFlatten(g);
 
     CHECK(g->getOrderedInputs().size() == 1);
-    CHECK(g->getOrderedOutputs().size() == 1);
     CHECK(g->getOrderedInputs()[0].first == fc0);
+
+    CHECK(g->getOrderedOutputs().size() == 1);
     CHECK(g->getOrderedOutputs()[0].first == fc1);
+    
     CHECK(fc1->getParent(0) == fc0);
     CHECK(fc0->getChildren(0)[0] == fc1);
     CHECK(g->getRootNode() == fc0);
@@ -81,11 +87,13 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
     removeFlatten(g);
 
     CHECK(g->getOrderedInputs().size() == 0);
+    
     CHECK(g->getOrderedOutputs().size() == 1);
-    CHECK(g->getOrderedInputs()[0].first == fc0);
     CHECK(g->getOrderedOutputs()[0].first == fc0);
+    
     CHECK(fc0->getParent(0) == prod);
     CHECK(fc0->getChildren(0).size() == 0);
+
     CHECK(g->getRootNode() == prod);
   }
 }