From 03bf2195041f01ae29fada2c882458235822a128 Mon Sep 17 00:00:00 2001 From: NAUD Maxence <maxence.naud@cea.fr> Date: Wed, 4 Oct 2023 14:31:46 +0000 Subject: [PATCH] [Upd] Created recipies directory in core/includes --- include/aidge/aidge.hpp | 2 +- include/aidge/{utils => recipies}/Recipies.hpp | 0 python_binding/recipies/pybind_Recipies.cpp | 2 +- src/recipies/FuseBatchNorm.cpp | 2 +- src/recipies/FuseMulAdd.cpp | 2 +- src/recipies/RemoveFlatten.cpp | 2 +- unit_tests/recipies/Test_FuseMulAdd.cpp | 6 +----- 7 files changed, 6 insertions(+), 10 deletions(-) rename include/aidge/{utils => recipies}/Recipies.hpp (100%) diff --git a/include/aidge/aidge.hpp b/include/aidge/aidge.hpp index 47ded2a46..79eae07b9 100644 --- a/include/aidge/aidge.hpp +++ b/include/aidge/aidge.hpp @@ -45,7 +45,7 @@ #include "aidge/utils/Attributes.hpp" #include "aidge/utils/StaticAttributes.hpp" #include "aidge/utils/DynamicAttributes.hpp" -#include "aidge/utils/Recipies.hpp" +#include "aidge/recipies/Recipies.hpp" #include "aidge/utils/Registrar.hpp" #include "aidge/utils/Types.h" //#include "aidge/utilsParsing/AstNode.hpp" diff --git a/include/aidge/utils/Recipies.hpp b/include/aidge/recipies/Recipies.hpp similarity index 100% rename from include/aidge/utils/Recipies.hpp rename to include/aidge/recipies/Recipies.hpp diff --git a/python_binding/recipies/pybind_Recipies.cpp b/python_binding/recipies/pybind_Recipies.cpp index 93c131ef7..4373b7f7f 100644 --- a/python_binding/recipies/pybind_Recipies.cpp +++ b/python_binding/recipies/pybind_Recipies.cpp @@ -14,7 +14,7 @@ #include <string> -#include "aidge/utils/Recipies.hpp" +#include "aidge/recipies/Recipies.hpp" namespace py = pybind11; diff --git a/src/recipies/FuseBatchNorm.cpp b/src/recipies/FuseBatchNorm.cpp index 3a50ec3e7..0ceec368d 100644 --- a/src/recipies/FuseBatchNorm.cpp +++ b/src/recipies/FuseBatchNorm.cpp @@ -16,7 +16,7 @@ #include "aidge/operator/BatchNorm.hpp" #include "aidge/operator/Conv.hpp" -#include "aidge/utils/Recipies.hpp" +#include "aidge/recipies/Recipies.hpp" #include "aidge/graph/GraphView.hpp" #include "aidge/graph/Node.hpp" #include "aidge/operator/Producer.hpp" diff --git a/src/recipies/FuseMulAdd.cpp b/src/recipies/FuseMulAdd.cpp index 1de79890f..75abd1fb6 100644 --- a/src/recipies/FuseMulAdd.cpp +++ b/src/recipies/FuseMulAdd.cpp @@ -15,7 +15,7 @@ #include <string> #include "aidge/operator/FC.hpp" -#include "aidge/utils/Recipies.hpp" +#include "aidge/recipies/Recipies.hpp" #include "aidge/graph/GraphView.hpp" #include "aidge/graph/Node.hpp" #include "aidge/operator/Producer.hpp" diff --git a/src/recipies/RemoveFlatten.cpp b/src/recipies/RemoveFlatten.cpp index 9096c107b..2dfa10ce2 100644 --- a/src/recipies/RemoveFlatten.cpp +++ b/src/recipies/RemoveFlatten.cpp @@ -13,7 +13,7 @@ #include "aidge/graph/Node.hpp" #include "aidge/graph/GraphView.hpp" -#include "aidge/utils/Recipies.hpp" +#include "aidge/recipies/Recipies.hpp" // Graph Regex #include "aidge/graphmatching/GRegex.hpp" diff --git a/unit_tests/recipies/Test_FuseMulAdd.cpp b/unit_tests/recipies/Test_FuseMulAdd.cpp index da5364205..92b2b7c13 100644 --- a/unit_tests/recipies/Test_FuseMulAdd.cpp +++ b/unit_tests/recipies/Test_FuseMulAdd.cpp @@ -12,17 +12,13 @@ #include <catch2/catch_test_macros.hpp> #include <set> -// #include "aidge/backend/cpu/operator/AddImpl.hpp" -// #include "aidge/backend/cpu/operator/ConvImpl.hpp" -// #include "aidge/backend/cpu/operator/FCImpl.hpp" -// #include "aidge/backend/cpu/operator/MatMulImpl.hpp" #include "aidge/data/Tensor.hpp" #include "aidge/graph/GraphView.hpp" #include "aidge/operator/Add.hpp" #include "aidge/operator/FC.hpp" #include "aidge/operator/MatMul.hpp" #include "aidge/operator/Producer.hpp" -#include "aidge/utils/Recipies.hpp" +#include "aidge/recipies/Recipies.hpp" namespace Aidge { -- GitLab