From 7945fbfe7838d9a0924544b959a634f251be6358 Mon Sep 17 00:00:00 2001 From: Olivier BICHLER <olivier.bichler@cea.fr> Date: Sat, 2 Mar 2024 18:38:29 +0100 Subject: [PATCH] Fixed typo --- aidge_core/unit_tests/{test_recipies.py => test_recipes.py} | 2 +- include/aidge/aidge.hpp | 2 +- include/aidge/{recipies => recipes}/GraphViewHelper.hpp | 4 ++-- include/aidge/{recipies => recipes}/LabelGraph.hpp | 6 +++--- .../aidge/{recipies/Recipies.hpp => recipes/Recipes.hpp} | 6 +++--- python_binding/pybind_core.cpp | 4 ++-- .../pybind_Recipies.cpp => recipes/pybind_Recipes.cpp} | 4 ++-- src/{recipies => recipes}/ExpandMetaOps.cpp | 2 +- src/{recipies => recipes}/ExplicitCastMove.cpp | 2 +- src/{recipies => recipes}/FuseBatchNorm.cpp | 2 +- src/{recipies => recipes}/FuseMulAdd.cpp | 2 +- src/{recipies => recipes}/HorizontalTiling.cpp | 2 +- src/{recipies => recipes}/LabelGraph.cpp | 2 +- src/{recipies => recipes}/RemoveDropout.cpp | 2 +- src/{recipies => recipes}/RemoveFlatten.cpp | 2 +- unit_tests/graphRegex/Test_GraphRegex.cpp | 2 +- unit_tests/operator/Test_MetaOperator.cpp | 2 +- unit_tests/{recipies => recipes}/Test_FuseMulAdd.cpp | 4 ++-- unit_tests/{recipies => recipes}/Test_LabelGraph.cpp | 2 +- unit_tests/{recipies => recipes}/Test_removeFlatten.cpp | 4 ++-- 20 files changed, 29 insertions(+), 29 deletions(-) rename aidge_core/unit_tests/{test_recipies.py => test_recipes.py} (98%) rename include/aidge/{recipies => recipes}/GraphViewHelper.hpp (94%) rename include/aidge/{recipies => recipes}/LabelGraph.hpp (90%) rename include/aidge/{recipies/Recipies.hpp => recipes/Recipes.hpp} (97%) rename python_binding/{recipies/pybind_Recipies.cpp => recipes/pybind_Recipes.cpp} (97%) rename src/{recipies => recipes}/ExpandMetaOps.cpp (96%) rename src/{recipies => recipes}/ExplicitCastMove.cpp (99%) rename src/{recipies => recipes}/FuseBatchNorm.cpp (99%) rename src/{recipies => recipes}/FuseMulAdd.cpp (99%) rename src/{recipies => recipes}/HorizontalTiling.cpp (99%) rename src/{recipies => recipes}/LabelGraph.cpp (98%) rename src/{recipies => recipes}/RemoveDropout.cpp (97%) rename src/{recipies => recipes}/RemoveFlatten.cpp (97%) rename unit_tests/{recipies => recipes}/Test_FuseMulAdd.cpp (95%) rename unit_tests/{recipies => recipes}/Test_LabelGraph.cpp (99%) rename unit_tests/{recipies => recipes}/Test_removeFlatten.cpp (92%) diff --git a/aidge_core/unit_tests/test_recipies.py b/aidge_core/unit_tests/test_recipes.py similarity index 98% rename from aidge_core/unit_tests/test_recipies.py rename to aidge_core/unit_tests/test_recipes.py index cc571d8e5..240bcd950 100644 --- a/aidge_core/unit_tests/test_recipies.py +++ b/aidge_core/unit_tests/test_recipes.py @@ -11,7 +11,7 @@ SPDX-License-Identifier: EPL-2.0 import unittest import aidge_core -class test_recipies(unittest.TestCase): +class test_recipes(unittest.TestCase): """ """ def setUp(self): diff --git a/include/aidge/aidge.hpp b/include/aidge/aidge.hpp index 6c4ca93ce..3c27e118a 100644 --- a/include/aidge/aidge.hpp +++ b/include/aidge/aidge.hpp @@ -65,7 +65,7 @@ #include "aidge/scheduler/Scheduler.hpp" #include "aidge/stimuli/Stimulus.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include "aidge/utils/Attributes.hpp" #include "aidge/utils/StaticAttributes.hpp" diff --git a/include/aidge/recipies/GraphViewHelper.hpp b/include/aidge/recipes/GraphViewHelper.hpp similarity index 94% rename from include/aidge/recipies/GraphViewHelper.hpp rename to include/aidge/recipes/GraphViewHelper.hpp index d7bcec713..c6204cdff 100644 --- a/include/aidge/recipies/GraphViewHelper.hpp +++ b/include/aidge/recipes/GraphViewHelper.hpp @@ -9,8 +9,8 @@ * ********************************************************************************/ -#ifndef AIDGE_CORE_UTILS_RECIPIES_H_ -#define AIDGE_CORE_UTILS_RECIPIES_H_ +#ifndef AIDGE_CORE_UTILS_RECIPES_H_ +#define AIDGE_CORE_UTILS_RECIPES_H_ #include <memory> #include <set> diff --git a/include/aidge/recipies/LabelGraph.hpp b/include/aidge/recipes/LabelGraph.hpp similarity index 90% rename from include/aidge/recipies/LabelGraph.hpp rename to include/aidge/recipes/LabelGraph.hpp index 9dd77e5e9..61f04c313 100644 --- a/include/aidge/recipies/LabelGraph.hpp +++ b/include/aidge/recipes/LabelGraph.hpp @@ -9,8 +9,8 @@ * ********************************************************************************/ -#ifndef AIDGE_RECIPIES_LABELGRAPH_H_ -#define AIDGE_RECIPIES_LABELGRAPH_H_ +#ifndef AIDGE_RECIPES_LABELGRAPH_H_ +#define AIDGE_RECIPES_LABELGRAPH_H_ #include "aidge/graph/GraphView.hpp" #include "aidge/graph/Node.hpp" @@ -32,4 +32,4 @@ NodePtr nodeLabel(NodePtr node); std::shared_ptr<GraphView> labelGraph(std::shared_ptr<GraphView> graph); } // namespace Aidge -#endif /* AIDGE_RECIPIES_LABELGRAPH_H_ */ +#endif /* AIDGE_RECIPES_LABELGRAPH_H_ */ diff --git a/include/aidge/recipies/Recipies.hpp b/include/aidge/recipes/Recipes.hpp similarity index 97% rename from include/aidge/recipies/Recipies.hpp rename to include/aidge/recipes/Recipes.hpp index da917030e..2f77ae707 100644 --- a/include/aidge/recipies/Recipies.hpp +++ b/include/aidge/recipes/Recipes.hpp @@ -9,8 +9,8 @@ * ********************************************************************************/ -#ifndef AIDGE_CORE_UTILS_RECIPIES_H_ -#define AIDGE_CORE_UTILS_RECIPIES_H_ +#ifndef AIDGE_CORE_UTILS_RECIPES_H_ +#define AIDGE_CORE_UTILS_RECIPES_H_ #include <memory> #include <set> @@ -123,4 +123,4 @@ void expandMetaOps(std::shared_ptr<GraphView> graph, bool recursive = false); } // namespace Aidge -#endif /* AIDGE_CORE_UTILS_RECIPIES_H_ */ +#endif /* AIDGE_CORE_UTILS_RECIPES_H_ */ diff --git a/python_binding/pybind_core.cpp b/python_binding/pybind_core.cpp index aa52368d7..6c4dd29df 100644 --- a/python_binding/pybind_core.cpp +++ b/python_binding/pybind_core.cpp @@ -66,7 +66,7 @@ void init_Connector(py::module&); void init_GraphRegex(py::module&); void init_MatchSolution(py::module&); -void init_Recipies(py::module&); +void init_Recipes(py::module&); void init_Scheduler(py::module&); void init_TensorUtils(py::module&); @@ -124,7 +124,7 @@ void init_Aidge(py::module& m){ init_GraphRegex(m); init_MatchSolution(m); - init_Recipies(m); + init_Recipes(m); init_Scheduler(m); init_TensorUtils(m); } diff --git a/python_binding/recipies/pybind_Recipies.cpp b/python_binding/recipes/pybind_Recipes.cpp similarity index 97% rename from python_binding/recipies/pybind_Recipies.cpp rename to python_binding/recipes/pybind_Recipes.cpp index bd058defb..f122c4116 100644 --- a/python_binding/recipies/pybind_Recipies.cpp +++ b/python_binding/recipes/pybind_Recipes.cpp @@ -15,13 +15,13 @@ #include <cstddef> #include <string> -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include "aidge/utils/Types.h" namespace py = pybind11; namespace Aidge { -void init_Recipies(py::module &m) { +void init_Recipes(py::module &m) { m.def("fuse_mul_add", static_cast<void(*)(std::shared_ptr<GraphView>)>(fuseMulAdd), py::arg("graph_view"), R"mydelimiter( diff --git a/src/recipies/ExpandMetaOps.cpp b/src/recipes/ExpandMetaOps.cpp similarity index 96% rename from src/recipies/ExpandMetaOps.cpp rename to src/recipes/ExpandMetaOps.cpp index 3a72fe043..16f0b4c52 100644 --- a/src/recipies/ExpandMetaOps.cpp +++ b/src/recipes/ExpandMetaOps.cpp @@ -11,7 +11,7 @@ #include <memory> -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include "aidge/operator/MetaOperator.hpp" void Aidge::expandMetaOps(std::shared_ptr<GraphView> graph, bool recursive) { diff --git a/src/recipies/ExplicitCastMove.cpp b/src/recipes/ExplicitCastMove.cpp similarity index 99% rename from src/recipies/ExplicitCastMove.cpp rename to src/recipes/ExplicitCastMove.cpp index 5651f2ba4..e6427b847 100644 --- a/src/recipies/ExplicitCastMove.cpp +++ b/src/recipes/ExplicitCastMove.cpp @@ -9,7 +9,7 @@ * ********************************************************************************/ -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include "aidge/operator/OperatorTensor.hpp" #include "aidge/operator/Cast.hpp" #include "aidge/operator/Move.hpp" diff --git a/src/recipies/FuseBatchNorm.cpp b/src/recipes/FuseBatchNorm.cpp similarity index 99% rename from src/recipies/FuseBatchNorm.cpp rename to src/recipes/FuseBatchNorm.cpp index 247de86fd..40a1b5952 100644 --- a/src/recipies/FuseBatchNorm.cpp +++ b/src/recipes/FuseBatchNorm.cpp @@ -21,7 +21,7 @@ #include "aidge/operator/ConvDepthWise.hpp" #include "aidge/operator/FC.hpp" #include "aidge/operator/MetaOperator.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include "aidge/utils/ErrorHandling.hpp" #include "aidge/utils/Types.h" diff --git a/src/recipies/FuseMulAdd.cpp b/src/recipes/FuseMulAdd.cpp similarity index 99% rename from src/recipies/FuseMulAdd.cpp rename to src/recipes/FuseMulAdd.cpp index 85bfc408f..65837d023 100644 --- a/src/recipies/FuseMulAdd.cpp +++ b/src/recipes/FuseMulAdd.cpp @@ -15,7 +15,7 @@ #include <string> #include "aidge/operator/FC.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include "aidge/graph/GraphView.hpp" #include "aidge/graph/Node.hpp" #include "aidge/operator/Producer.hpp" diff --git a/src/recipies/HorizontalTiling.cpp b/src/recipes/HorizontalTiling.cpp similarity index 99% rename from src/recipies/HorizontalTiling.cpp rename to src/recipes/HorizontalTiling.cpp index 7d3fafc0a..4d18e012e 100644 --- a/src/recipies/HorizontalTiling.cpp +++ b/src/recipes/HorizontalTiling.cpp @@ -15,7 +15,7 @@ #include <vector> #include <utility> -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include "aidge/graph/Node.hpp" #include "aidge/graph/GraphView.hpp" diff --git a/src/recipies/LabelGraph.cpp b/src/recipes/LabelGraph.cpp similarity index 98% rename from src/recipies/LabelGraph.cpp rename to src/recipes/LabelGraph.cpp index 6966bb81d..ac0e6bfe1 100644 --- a/src/recipies/LabelGraph.cpp +++ b/src/recipes/LabelGraph.cpp @@ -11,7 +11,7 @@ #include <memory> -#include "aidge/recipies/LabelGraph.hpp" +#include "aidge/recipes/LabelGraph.hpp" #include "aidge/operator/Conv.hpp" #include "aidge/operator/ConvDepthWise.hpp" #include "aidge/operator/AvgPooling.hpp" diff --git a/src/recipies/RemoveDropout.cpp b/src/recipes/RemoveDropout.cpp similarity index 97% rename from src/recipies/RemoveDropout.cpp rename to src/recipes/RemoveDropout.cpp index 1dedac8f1..d141f5d3a 100644 --- a/src/recipies/RemoveDropout.cpp +++ b/src/recipes/RemoveDropout.cpp @@ -14,7 +14,7 @@ #include "aidge/graph/Node.hpp" #include "aidge/graph/GraphView.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" //Graph Regex #include "aidge/graphRegex/GraphRegex.hpp" diff --git a/src/recipies/RemoveFlatten.cpp b/src/recipes/RemoveFlatten.cpp similarity index 97% rename from src/recipies/RemoveFlatten.cpp rename to src/recipes/RemoveFlatten.cpp index d571b5302..c28c4794e 100644 --- a/src/recipies/RemoveFlatten.cpp +++ b/src/recipes/RemoveFlatten.cpp @@ -13,7 +13,7 @@ #include "aidge/graph/Node.hpp" #include "aidge/graph/GraphView.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" //Graph Regex diff --git a/unit_tests/graphRegex/Test_GraphRegex.cpp b/unit_tests/graphRegex/Test_GraphRegex.cpp index 1330a8e62..bcd6d0f4c 100644 --- a/unit_tests/graphRegex/Test_GraphRegex.cpp +++ b/unit_tests/graphRegex/Test_GraphRegex.cpp @@ -9,7 +9,7 @@ #include "aidge/operator/FC.hpp" #include "aidge/operator/MatMul.hpp" #include "aidge/operator/Producer.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include "aidge/operator/Conv.hpp" #include "aidge/operator/GenericOperator.hpp" diff --git a/unit_tests/operator/Test_MetaOperator.cpp b/unit_tests/operator/Test_MetaOperator.cpp index 8245d0044..3ff2a3c6c 100644 --- a/unit_tests/operator/Test_MetaOperator.cpp +++ b/unit_tests/operator/Test_MetaOperator.cpp @@ -16,7 +16,7 @@ #include "aidge/operator/MetaOperatorDefs.hpp" #include "aidge/graph/GraphView.hpp" #include "aidge/graph/Testing.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" #include <cstddef> using namespace Aidge; diff --git a/unit_tests/recipies/Test_FuseMulAdd.cpp b/unit_tests/recipes/Test_FuseMulAdd.cpp similarity index 95% rename from unit_tests/recipies/Test_FuseMulAdd.cpp rename to unit_tests/recipes/Test_FuseMulAdd.cpp index d0875fe10..4c6e3f9d5 100644 --- a/unit_tests/recipies/Test_FuseMulAdd.cpp +++ b/unit_tests/recipes/Test_FuseMulAdd.cpp @@ -18,12 +18,12 @@ #include "aidge/operator/FC.hpp" #include "aidge/operator/MatMul.hpp" #include "aidge/operator/Producer.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" namespace Aidge { -TEST_CASE("[cpu/recipies] FuseMulAdd", "[FuseMulAdd][recipies]") { +TEST_CASE("[cpu/recipes] FuseMulAdd", "[FuseMulAdd][recipes]") { // generate the original GraphView auto matmul0 = MatMul("matmul0"); auto add0 = Add(2, "add0"); diff --git a/unit_tests/recipies/Test_LabelGraph.cpp b/unit_tests/recipes/Test_LabelGraph.cpp similarity index 99% rename from unit_tests/recipies/Test_LabelGraph.cpp rename to unit_tests/recipes/Test_LabelGraph.cpp index e0ba9be6c..78f67d823 100644 --- a/unit_tests/recipies/Test_LabelGraph.cpp +++ b/unit_tests/recipes/Test_LabelGraph.cpp @@ -11,7 +11,7 @@ #include <catch2/catch_test_macros.hpp> -#include "aidge/recipies/LabelGraph.hpp" +#include "aidge/recipes/LabelGraph.hpp" #include "aidge/operator/Conv.hpp" #include "aidge/operator/AvgPooling.hpp" #include "aidge/operator/MaxPooling.hpp" diff --git a/unit_tests/recipies/Test_removeFlatten.cpp b/unit_tests/recipes/Test_removeFlatten.cpp similarity index 92% rename from unit_tests/recipies/Test_removeFlatten.cpp rename to unit_tests/recipes/Test_removeFlatten.cpp index 8d0ff29da..6c805e4cf 100644 --- a/unit_tests/recipies/Test_removeFlatten.cpp +++ b/unit_tests/recipes/Test_removeFlatten.cpp @@ -16,12 +16,12 @@ #include "aidge/graph/GraphView.hpp" #include "aidge/operator/GenericOperator.hpp" #include "aidge/operator/FC.hpp" -#include "aidge/recipies/Recipies.hpp" +#include "aidge/recipes/Recipes.hpp" namespace Aidge { -TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { +TEST_CASE("[cpu/recipes] RemoveFlatten", "[RemoveFlatten][recipes]") { // generate the original GraphView auto flatten = GenericOperator("Flatten", 1, 0, 1, "myFlatten"); auto fc = FC(10, 50, "myFC"); -- GitLab