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 cc571d8e5db1beae7fbdb0047c8ae7ced3339fc9..240bcd9501aa1fd64985fa59c87f01dfdf9343aa 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 6c4ca93ce28c0a8c769606f07b1badee676423fd..3c27e118a384debdaf5505aec4ab993f260a97de 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 d7bcec713087054640c87c6fd229fee53d1ed4a6..c6204cdffa5e580190b8cd3f1817788a12e00bc3 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 9dd77e5e9f397260cf936cf77b15616c17ea33b8..61f04c313bb4c12861b2a57299761208124e9cbf 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 da917030e5341f15de575400490d95be83f123bf..2f77ae707ff66a6d68f649796d1bf07cce1e4498 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 aa52368d77c85d4d12383268f59a856564961276..6c4dd29dfbb158774ea86b181503e7e7e718bda4 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 bd058defb21c13cea1323e4748129c92519de039..f122c411618ce28a641fd46ee568f99cc48e9f58 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 3a72fe04315b2e746ebeb75f2456973bbf142440..16f0b4c52f394e32e24fa49951c39a7c2cb35162 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 5651f2ba4cc939678ab306137464c52caa1db46c..e6427b8472f2ae38d97adf5dc0908c0739bdccf5 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 247de86fdac6366aa8ac963ac65c55c3c30e57a0..40a1b5952220c57140d15adc6ee42a83a43eb6ef 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 85bfc408f092d9f234265db51a01eff1ab64005b..65837d02301f17db95d414c26148b3420f2b191a 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 7d3fafc0a15d1b797fdfb1a2884b62d2d8d766c5..4d18e012e2d0d817e3317601d188d0cab64b05b5 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 6966bb81d000b62d904f800233048fa58998c6fb..ac0e6bfe197460c8c422a6c1f3b3240518ee1f29 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 1dedac8f19e6ec6b4b1f6dabb6bd3e9b8c759def..d141f5d3a74e42f8f0fc5465fda043f91f37d5bc 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 d571b53023b7665c25aedc869628045b3b13d509..c28c4794e9611cdedd0bd8c76a1e6d7580dc17b6 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 1330a8e620ae5d49d6ef61257a587b914ffed1cd..bcd6d0f4cd9ba32ee4318188343b7e6360670d3b 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 8245d0044b6358866b06115c33a9bb7ef2862185..3ff2a3c6c7422c1ead53a629670975a25e54f7d7 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 d0875fe10078eb9d8e3a97e0703191b5697f3fda..4c6e3f9d563d2e74958e68f8876a49a8323f4403 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 e0ba9be6c80ef6109b59458bf52a23120efc7584..78f67d823a17454c1ecff40a2307556c990c4f53 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 8d0ff29dae19ba2dd8009441c39da53bf44378f0..6c805e4cfc64ad3dcfbf020e74926dd0aeca5f9f 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");