diff --git a/aidge_export_cpp/export_utils.py b/aidge_export_cpp/export_utils.py index b8f9eaf74d1ec604e1b837b33e77bd0e60c3ddba..83738d340dc4811a296dc37a382f0462751c9887 100644 --- a/aidge_export_cpp/export_utils.py +++ b/aidge_export_cpp/export_utils.py @@ -2,7 +2,7 @@ import os from collections import OrderedDict import aidge_core -from aidge_core.export_utils import get_node +from aidge_core.export_utils import get_node_from_metaop def cpp_fuse_to_metaops(graph_view: aidge_core.GraphView): """ @@ -198,7 +198,7 @@ def set_scaling_attributes(export_node: aidge_core.export_utils.ExportNode, node :type node: aidge_core.Node """ - QNode = get_node(node, "Quantizer") + QNode = get_node_from_metaop(node, "Quantizer") if QNode is not None: for n in QNode.get_operator().get_micro_graph().get_nodes(): diff --git a/aidge_export_cpp/operators/Conv.py b/aidge_export_cpp/operators/Conv.py index 4207184b6417f96064f5f8c1f6dcca38df07c13a..e1d17bc637a98bb237d69fabe901542a0871dc2c 100644 --- a/aidge_export_cpp/operators/Conv.py +++ b/aidge_export_cpp/operators/Conv.py @@ -1,5 +1,5 @@ import aidge_core -from aidge_core.export_utils import ExportNodeCpp, get_node +from aidge_core.export_utils import ExportNodeCpp, get_node_from_metaop from aidge_export_cpp import ROOT, ExportLibCpp, set_scaling_attributes @ExportLibCpp.register("Conv2D", aidge_core.ImplSpec(aidge_core.IOSpec(aidge_core.dtype.any))) @@ -17,7 +17,7 @@ class Conv(ExportNodeCpp): self.attributes["shift_value"] = 0 # Browse the metaop to update kernel attributes - ConvNode = get_node(node, "Conv2D") + ConvNode = get_node_from_metaop(node, "Conv2D") self.attributes["kernel_dims"] = ConvNode.get_operator().attr.kernel_dims self.attributes["stride_dims"] = ConvNode.get_operator().attr.stride_dims self.attributes["dilation_dims"] = ConvNode.get_operator().attr.dilation_dims @@ -60,7 +60,7 @@ class PadConv(QConv): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - PadNode = get_node(node, "Pad2D") + PadNode = get_node_from_metaop(node, "Pad2D") self.attributes["padding"] = PadNode.get_operator().attr.begin_end_borders @@ -70,9 +70,9 @@ class ConvAct(QConv): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - if get_node(node, "ReLU") is not None: + if get_node_from_metaop(node, "ReLU") is not None: self.attributes["activation"] = "Rectifier" - elif get_node(node, "LeakyReLU") is not None: + elif get_node_from_metaop(node, "LeakyReLU") is not None: aidge_core.Log.fatal(f"{node.type()} activation is not yet supported.") # TODO : Should not be checked manually for each activation diff --git a/aidge_export_cpp/operators/ElemWise.py b/aidge_export_cpp/operators/ElemWise.py index 6a9ee7e4d2241ed424262f6af9d401aa3aaf52ba..460350948961d7435269c6a9c5f1046ae11b98cd 100644 --- a/aidge_export_cpp/operators/ElemWise.py +++ b/aidge_export_cpp/operators/ElemWise.py @@ -1,5 +1,5 @@ import aidge_core -from aidge_core.export_utils import ExportNodeCpp, get_node +from aidge_core.export_utils import ExportNodeCpp, get_node_from_metaop from aidge_export_cpp import ROOT, ExportLibCpp, set_scaling_attributes class ElemWise(ExportNodeCpp): @@ -66,9 +66,9 @@ class AddAct(QAdd): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - if get_node(node, "ReLU") is not None: + if get_node_from_metaop(node, "ReLU") is not None: self.attributes["activation"] = "Rectifier" - elif get_node(node, "LeakyReLU") is not None: + elif get_node_from_metaop(node, "LeakyReLU") is not None: aidge_core.Log.fatal(f"{node.type()} activation is not yet supported.") # TODO : Should not be checked manually for each activation @@ -92,9 +92,9 @@ class SubAct(QSub): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - if get_node(node, "ReLU") is not None: + if get_node_from_metaop(node, "ReLU") is not None: self.attributes["activation"] = "Rectifier" - elif get_node(node, "LeakyReLU") is not None: + elif get_node_from_metaop(node, "LeakyReLU") is not None: aidge_core.Log.fatal(f"{node.type()} activation is not yet supported.") # TODO : Should not be checked manually for each activation @@ -118,8 +118,8 @@ class MulAct(QMul): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - if get_node(node, "ReLU") is not None: + if get_node_from_metaop(node, "ReLU") is not None: self.attributes["activation"] = "Rectifier" - elif get_node(node, "LeakyReLU") is not None: + elif get_node_from_metaop(node, "LeakyReLU") is not None: aidge_core.Log.fatal(f"{node.type()} activation is not yet supported.") # TODO : Should not be checked manually for each activation \ No newline at end of file diff --git a/aidge_export_cpp/operators/Pool.py b/aidge_export_cpp/operators/Pool.py index 5b483bdeb8b634391f8edaa9340a901a100d4aad..bf7e7eb81d3e86227db545acc20d9c894218b8da 100644 --- a/aidge_export_cpp/operators/Pool.py +++ b/aidge_export_cpp/operators/Pool.py @@ -1,5 +1,5 @@ import aidge_core -from aidge_core.export_utils import ExportNodeCpp, get_node +from aidge_core.export_utils import ExportNodeCpp, get_node_from_metaop from aidge_export_cpp import ROOT from aidge_export_cpp import ExportLibCpp @@ -37,7 +37,7 @@ class PadPool(Pool): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - PadNode = get_node(node, "Pad2D") + PadNode = get_node_from_metaop(node, "Pad2D") self.attributes["padding"] = PadNode.get_operator().attr.begin_end_borders @@ -46,9 +46,9 @@ class PoolAct(Pool): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - if get_node(node, "ReLU") is not None: + if get_node_from_metaop(node, "ReLU") is not None: self.attributes["activation"] = "Rectifier" - elif get_node(node, "LeakyReLU") is not None: + elif get_node_from_metaop(node, "LeakyReLU") is not None: aidge_core.Log.fatal(f"{node.type()} activation is not yet supported.") # TODO : Should not be checked manually for each activation @@ -59,7 +59,7 @@ class MaxPool(Pool): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - PoolNode = get_node(node, "MaxPooling2D") + PoolNode = get_node_from_metaop(node, "MaxPooling2D") self.attributes["pool_type"] = "Max" self.attributes["kernel_dims"] = PoolNode.get_operator().attr.kernel_dims self.attributes["stride_dims"] = PoolNode.get_operator().attr.stride_dims @@ -89,7 +89,7 @@ class AvgPool(Pool): super().__init__(node, mem_info) # Browse the metaop to update kernel attributes - PoolNode = get_node(node, "AvgPooling2D") + PoolNode = get_node_from_metaop(node, "AvgPooling2D") self.attributes["pool_type"] = "Average" self.attributes["kernel_dims"] = PoolNode.get_operator().attr.kernel_dims self.attributes["stride_dims"] = PoolNode.get_operator().attr.stride_dims diff --git a/aidge_export_cpp/operators/Quantizer.py b/aidge_export_cpp/operators/Quantizer.py index cadc3bf6d77ee91e16e864ec90af49da74820b7c..a33bc147ff5677700ccf96413b5e84edffaf41fe 100644 --- a/aidge_export_cpp/operators/Quantizer.py +++ b/aidge_export_cpp/operators/Quantizer.py @@ -1,5 +1,5 @@ import aidge_core -from aidge_core.export_utils import ExportNodeCpp, get_node +from aidge_core.export_utils import ExportNodeCpp, get_node_from_metaop from aidge_export_cpp import ROOT, ExportLibCpp, set_scaling_attributes @ExportLibCpp.register_metaop("Quantizer", aidge_core.ImplSpec(aidge_core.IOSpec(aidge_core.dtype.any))) @@ -15,9 +15,9 @@ class CppRescaling(ExportNodeCpp): self.attributes["aidge_cmp"] = node.attributes().has_attr("aidge_cmp") # Browse the metaop to update kernel attributes - if get_node(node, "ReLU") is not None: + if get_node_from_metaop(node, "ReLU") is not None: self.attributes["activation"] = "Rectifier" - elif get_node(node, "LeakyReLU") is not None: + elif get_node_from_metaop(node, "LeakyReLU") is not None: aidge_core.Log.fatal(f"{node.type()} activation is not yet supported.") # TODO : Should not be checked manually for each activation