From cbf9c77263b8ebf778457281d8b92ff1e626f089 Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Fri, 19 Jul 2024 11:30:40 +0000
Subject: [PATCH] Add In/Out Format in NodeExport.
---
aidge_core/export_utils/node_export.py | 4 ++++
python_binding/data/pybind_Data.cpp | 3 +++
2 files changed, 7 insertions(+)
diff --git a/aidge_core/export_utils/node_export.py b/aidge_core/export_utils/node_export.py
index dff852c16..df698ca8e 100644
--- a/aidge_core/export_utils/node_export.py
+++ b/aidge_core/export_utils/node_export.py
@@ -137,6 +137,7 @@ class ExportNode(ABC):
self.attributes["in_name"] = [None] * self.attributes["nb_in"]
self.attributes["in_dims"] = [None] * self.attributes["nb_in"]
self.attributes["in_dformat"] = [None] * self.attributes["nb_in"]
+ self.attributes["in_format"] = [None] * self.attributes["nb_in"]
self.attributes["in_dtype"] = [None] * self.attributes["nb_in"]
self.attributes["in_cdtype"] = [None] * self.attributes["nb_in"]
self.attributes["in_chan"] = [None] * self.attributes["nb_in"]
@@ -146,6 +147,7 @@ class ExportNode(ABC):
self.attributes["out_name"] = [None] * self.attributes["nb_out"]
self.attributes["out_dims"] = [None] * self.attributes["nb_out"]
self.attributes["out_dformat"] = [None] * self.attributes["nb_out"]
+ self.attributes["out_format"] = [None] * self.attributes["nb_out"]
self.attributes["out_dtype"] = [None] * self.attributes["nb_out"]
self.attributes["out_cdtype"] = [None] * self.attributes["nb_out"]
self.attributes["out_chan"] = [None] * self.attributes["nb_out"]
@@ -174,6 +176,7 @@ class ExportNode(ABC):
self.attributes["in_name"][idx] = f"{self.attributes['name']}_input_{idx}" if parent_node is None else f"{parent_node.name()}_output_{out_id}"
self.attributes["in_dims"][idx] = tensor.dims()
self.attributes["in_dformat"][idx] = tensor.dformat()
+ self.attributes["in_format"][idx] = aidge_core.format_as(tensor.dformat())
self.attributes["in_dtype"][idx] = tensor.dtype()
self.attributes["in_cdtype"][idx] = data_conversion.aidge2c(
tensor.dtype())
@@ -190,6 +193,7 @@ class ExportNode(ABC):
self.attributes["out_name"][idx] = f"{self.attributes['name']}_output_{idx}"
self.attributes["out_dims"][idx] = tensor.dims()
self.attributes["out_dformat"][idx] = tensor.dformat()
+ self.attributes["out_format"][idx] = aidge_core.format_as(tensor.dformat())
self.attributes["out_dtype"][idx] = tensor.dtype()
self.attributes["out_cdtype"][idx] = data_conversion.aidge2c(
tensor.dtype())
diff --git a/python_binding/data/pybind_Data.cpp b/python_binding/data/pybind_Data.cpp
index d750c50d9..3df61442e 100644
--- a/python_binding/data/pybind_Data.cpp
+++ b/python_binding/data/pybind_Data.cpp
@@ -45,5 +45,8 @@ void init_Data(py::module& m){
py::class_<Data, std::shared_ptr<Data>>(m,"Data");
+ m.def("format_as", (const char* (*)(DataType)) &format_as, py::arg("dt"));
+ m.def("format_as", (const char* (*)(DataFormat)) &format_as, py::arg("df"));
+
}
}
--
GitLab