From 5353b25db3b1cb05ee492389f1de6ec09aa46127 Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Wed, 25 Sep 2024 06:55:22 +0000
Subject: [PATCH] Update recipes with new type name.
---
src/recipes/ConvToMatMul.cpp | 2 +-
src/recipes/FuseBatchNorm.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/recipes/ConvToMatMul.cpp b/src/recipes/ConvToMatMul.cpp
index 9b88ffc73..31462861e 100644
--- a/src/recipes/ConvToMatMul.cpp
+++ b/src/recipes/ConvToMatMul.cpp
@@ -24,7 +24,7 @@
#include "aidge/recipes/Recipes.hpp"
size_t Aidge::convToMatMul(std::shared_ptr<GraphView> graphView) {
- const auto matches = SinglePassGraphMatching(graphView).match("Conv");
+ const auto matches = SinglePassGraphMatching(graphView).match("Conv2D");
size_t nbReplaced = 0;
for (const auto& match : matches) {
diff --git a/src/recipes/FuseBatchNorm.cpp b/src/recipes/FuseBatchNorm.cpp
index 34722c19f..4c4de2528 100644
--- a/src/recipes/FuseBatchNorm.cpp
+++ b/src/recipes/FuseBatchNorm.cpp
@@ -190,9 +190,10 @@ void Aidge::fuseBatchNorm(std::shared_ptr<Aidge::Node> convNode,
}
void Aidge::fuseBatchNorm(std::shared_ptr<Aidge::GraphView> graphView) {
- auto matches = SinglePassGraphMatching(graphView).match("(Conv|ConvDepthWise|PaddedConv|PaddedConvDepthWise)->BatchNorm");
+ auto matches = SinglePassGraphMatching(graphView).match("(Conv2D|ConvDepthWise2D|PaddedConv2D|PaddedConvDepthWise2D)->BatchNorm2D");
for (auto match : matches) {
+ fmt::println("Match !");
auto rootNode = match.graph->rootNode();
fuseBatchNorm(rootNode, *rootNode->getChildren().begin());
}
--
GitLab