From 064955b6d37f5eb96b0e15b9d8a5e3064cbb6f36 Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Tue, 18 Jun 2024 22:09:46 +0200
Subject: [PATCH] Minor fixes
---
include/aidge/operator/Pad.hpp | 3 ---
src/operator/Pad.cpp | 4 ++++
unit_tests/operator/Test_MetaOperator.cpp | 2 +-
unit_tests/recipes/Test_removeFlatten.cpp | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/aidge/operator/Pad.hpp b/include/aidge/operator/Pad.hpp
index 810464f4d..5a2a76073 100644
--- a/include/aidge/operator/Pad.hpp
+++ b/include/aidge/operator/Pad.hpp
@@ -112,9 +112,6 @@ public:
}
};
-template <DimIdx_t DIM>
-const std::string Pad_Op<DIM>::Type = "Pad";
-
template <std::array<DimSize_t, 1>::size_type DIM>
inline std::shared_ptr<Node> Pad(const std::array<DimSize_t, 2*DIM> &beginEndTuples,
const std::string& name = "",
diff --git a/src/operator/Pad.cpp b/src/operator/Pad.cpp
index 8356b5da7..c66e6c84a 100644
--- a/src/operator/Pad.cpp
+++ b/src/operator/Pad.cpp
@@ -10,6 +10,10 @@
********************************************************************************/
#include "aidge/operator/Pad.hpp"
+#include "aidge/utils/Types.h"
+
+template <Aidge::DimIdx_t DIM>
+const std::string Aidge::Pad_Op<DIM>::Type = "Pad";
template class Aidge::Pad_Op<1>;
template class Aidge::Pad_Op<2>;
diff --git a/unit_tests/operator/Test_MetaOperator.cpp b/unit_tests/operator/Test_MetaOperator.cpp
index ed4afafe3..17be4d710 100644
--- a/unit_tests/operator/Test_MetaOperator.cpp
+++ b/unit_tests/operator/Test_MetaOperator.cpp
@@ -129,6 +129,6 @@ TEST_CASE("[core/operators] MetaOperator", "[Operator][MetaOperator]") {
REQUIRE(g->rootNode() == pop);
g->save("lstm_expanded", true, true);
- REQUIRE(g->getNodes().size() == 41);
+ REQUIRE(g->getNodes().size() == 33);
}
}
diff --git a/unit_tests/recipes/Test_removeFlatten.cpp b/unit_tests/recipes/Test_removeFlatten.cpp
index 84099ac0b..24f5aa2e2 100644
--- a/unit_tests/recipes/Test_removeFlatten.cpp
+++ b/unit_tests/recipes/Test_removeFlatten.cpp
@@ -27,8 +27,8 @@ namespace Aidge {
TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") {
std::shared_ptr<Node> flatten =
GenericOperator("Flatten", 1, 0, 1, "myFlatten");
- std::shared_ptr<Node> fc0 = FC(10, 10, "FC_1");
- std::shared_ptr<Node> fc1 = FC(10, 10, "FC_2");
+ std::shared_ptr<Node> fc0 = FC(10, 10, false, "FC_1");
+ std::shared_ptr<Node> fc1 = FC(10, 10, false, "FC_2");
std::shared_ptr<Node> prod = Producer(std::array<DimSize_t, 10>(), "myProd");
SECTION("flatten last layer : nothing removed because pattern searched is "
--
GitLab