From bc36561a46a47e0519042229aec72b3af2f42ac8 Mon Sep 17 00:00:00 2001 From: NAUD Maxence <maxence.naud@cea.fr> Date: Thu, 17 Oct 2024 14:33:43 +0000 Subject: [PATCH] Path to Operator header file should be specified by hand because the file name may not be exactly named like the associated Operator's type --- aidge_core/aidge_export_aidge/export.py | 2 +- aidge_core/aidge_export_aidge/operator_export/conv.py | 2 +- aidge_core/aidge_export_aidge/operator_export/fc.py | 2 +- aidge_core/aidge_export_aidge/operator_export/maxpooling.py | 2 +- aidge_core/aidge_export_aidge/operator_export/producer.py | 2 +- aidge_core/aidge_export_aidge/operator_export/relu.py | 2 +- aidge_core/aidge_export_aidge/operator_export/sub.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aidge_core/aidge_export_aidge/export.py b/aidge_core/aidge_export_aidge/export.py index aa993c4be..51468ed84 100644 --- a/aidge_core/aidge_export_aidge/export.py +++ b/aidge_core/aidge_export_aidge/export.py @@ -93,7 +93,7 @@ def serialize_to_cpp(export_folder: str, node, None) - set_operator.add(node.type()) + # set_operator.add(node.type()) # TODO: list_configs and list_actions don't need to be passed by argument # Export the configuration diff --git a/aidge_core/aidge_export_aidge/operator_export/conv.py b/aidge_core/aidge_export_aidge/operator_export/conv.py index 8805629b7..ea23c1551 100644 --- a/aidge_core/aidge_export_aidge/operator_export/conv.py +++ b/aidge_core/aidge_export_aidge/operator_export/conv.py @@ -11,7 +11,7 @@ class Conv(ExportNodeCpp): ROOT_EXPORT / "templates/attributes/conv.jinja") self.forward_template = str( ROOT_EXPORT /"templates/graph_ctor/conv.jinja") - self.include_list = [] + self.include_list = ["aidge/operator/Conv.hpp"] self.kernels_to_copy = [] self.config_path = "include/attributes" self.config_extension = "hpp" diff --git a/aidge_core/aidge_export_aidge/operator_export/fc.py b/aidge_core/aidge_export_aidge/operator_export/fc.py index 6fae97d66..4f964a994 100644 --- a/aidge_core/aidge_export_aidge/operator_export/fc.py +++ b/aidge_core/aidge_export_aidge/operator_export/fc.py @@ -12,7 +12,7 @@ class FC(ExportNodeCpp): ROOT_EXPORT / "templates/attributes/fc.jinja") self.forward_template = str( ROOT_EXPORT / "templates/graph_ctor/fc.jinja") - self.include_list = [] + self.include_list = ["aidge/operator/FC.hpp"] self.kernels_to_copy = [] self.config_path = "include/attributes" self.config_extension = "hpp" diff --git a/aidge_core/aidge_export_aidge/operator_export/maxpooling.py b/aidge_core/aidge_export_aidge/operator_export/maxpooling.py index df53de9eb..6d9c7998f 100644 --- a/aidge_core/aidge_export_aidge/operator_export/maxpooling.py +++ b/aidge_core/aidge_export_aidge/operator_export/maxpooling.py @@ -11,7 +11,7 @@ class MaxPooling(ExportNodeCpp): ROOT_EXPORT / "templates/attributes/maxpooling.jinja") self.forward_template = str( ROOT_EXPORT / "templates/graph_ctor/maxpooling.jinja") - self.include_list = [] + self.include_list = ["aidge/operator/MaxPooling.hpp"] self.kernels_to_copy = [] self.config_path = "include/attributes" self.config_extension = "hpp" diff --git a/aidge_core/aidge_export_aidge/operator_export/producer.py b/aidge_core/aidge_export_aidge/operator_export/producer.py index 475d36255..02f2f1f39 100644 --- a/aidge_core/aidge_export_aidge/operator_export/producer.py +++ b/aidge_core/aidge_export_aidge/operator_export/producer.py @@ -23,7 +23,7 @@ class Producer(ExportNodeCpp): ROOT_EXPORT / "templates/graph_ctor/producer.jinja") self.attributes["tensor_name"] = f"{child.name()}_{in_idx}" self.attributes["values"] = str(self.operator.get_output(0)) - self.include_list = [] + self.include_list = ["aidge/operator/Producer.hpp"] self.kernels_to_copy = [] self.config_path = "include/attributes" self.config_extension = "hpp" diff --git a/aidge_core/aidge_export_aidge/operator_export/relu.py b/aidge_core/aidge_export_aidge/operator_export/relu.py index 300135734..b8398e305 100644 --- a/aidge_core/aidge_export_aidge/operator_export/relu.py +++ b/aidge_core/aidge_export_aidge/operator_export/relu.py @@ -10,5 +10,5 @@ class ReLU(ExportNodeCpp): self.config_template = "" self.forward_template = str( ROOT_EXPORT / "templates/graph_ctor/relu.jinja") - self.include_list = [] + self.include_list = ["aidge/operator/ReLU.hpp"] self.kernels_to_copy = [] diff --git a/aidge_core/aidge_export_aidge/operator_export/sub.py b/aidge_core/aidge_export_aidge/operator_export/sub.py index b728e088d..01b68b70f 100644 --- a/aidge_core/aidge_export_aidge/operator_export/sub.py +++ b/aidge_core/aidge_export_aidge/operator_export/sub.py @@ -10,5 +10,5 @@ class Sub(ExportNodeCpp): self.config_template = "" self.forward_template = str( ROOT_EXPORT / "templates/graph_ctor/sub.jinja") - self.include_list = [] + self.include_list = ["aidge/operator/Sub.hpp"] self.kernels_to_copy = [] -- GitLab