diff --git a/aidge_core/__init__.py b/aidge_core/__init__.py index 38f5faa94b3fd08287977bdc4e1af60650af69cd..00556a025372f5ab02a051b16a4e5f171a84905f 100644 --- a/aidge_core/__init__.py +++ b/aidge_core/__init__.py @@ -8,6 +8,8 @@ http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0 """ from aidge_core.aidge_core import * # import so generated by PyBind -from aidge_core.export_utils import ExportNodeCpp, ExportNode, generate_file, generate_str +# from aidge_core.export_utils import ExportNodeCpp, ExportNode, generate_file, generate_str +import aidge_core.export_utils + import aidge_core.utils -from aidge_core.aidge_export_aidge import * +import aidge_core.aidge_export_aidge diff --git a/aidge_core/aidge_export_aidge/export.py b/aidge_core/aidge_export_aidge/export.py index b0e859b71e77bb03b95acb6ca75dcf09a8af0722..a5b9df0c8efd0d10802d353468274d13005762f8 100644 --- a/aidge_core/aidge_export_aidge/export.py +++ b/aidge_core/aidge_export_aidge/export.py @@ -6,7 +6,7 @@ from .utils import supported_operators, OPERATORS_REGISTRY from . import ROOT_EXPORT -from aidge_core import ExportNode, generate_file +from aidge_core.export_utils import ExportNode, generate_file diff --git a/aidge_core/aidge_export_aidge/operator_export/conv.py b/aidge_core/aidge_export_aidge/operator_export/conv.py index fb7092fb18982a3cc3f11a1ca47394ce2f77d0b6..ee38fe72ee6ea61ea9c27cfbdb4368dc136cb2f7 100644 --- a/aidge_core/aidge_export_aidge/operator_export/conv.py +++ b/aidge_core/aidge_export_aidge/operator_export/conv.py @@ -1,6 +1,6 @@ from aidge_core.aidge_export_aidge.utils import operator_register, parse_node_input from aidge_core.aidge_export_aidge import ROOT_EXPORT -from aidge_core import ExportNode, generate_file, generate_str +from aidge_core.export_utils import ExportNode, generate_file, generate_str from pathlib import Path @operator_register("Conv") diff --git a/aidge_core/aidge_export_aidge/operator_export/fc.py b/aidge_core/aidge_export_aidge/operator_export/fc.py index fcd528528707dc6eec917790b46e509c2984fa66..c72fe7648822cbf2e04642dd68a0d7a6b1dd9f46 100644 --- a/aidge_core/aidge_export_aidge/operator_export/fc.py +++ b/aidge_core/aidge_export_aidge/operator_export/fc.py @@ -1,6 +1,6 @@ from aidge_core.aidge_export_aidge.utils import operator_register,parse_node_input from aidge_core.aidge_export_aidge import ROOT_EXPORT -from aidge_core import ExportNode, generate_file, generate_str +from aidge_core.export_utils import ExportNode, generate_file, generate_str from pathlib import Path @operator_register("FC") diff --git a/aidge_core/aidge_export_aidge/operator_export/maxpooling.py b/aidge_core/aidge_export_aidge/operator_export/maxpooling.py index 0c63e71b423b90f62536cafd25c61101e76e0562..ef996e6e6310521482fcede7aedf8ab643537ffc 100644 --- a/aidge_core/aidge_export_aidge/operator_export/maxpooling.py +++ b/aidge_core/aidge_export_aidge/operator_export/maxpooling.py @@ -1,6 +1,6 @@ from aidge_core.aidge_export_aidge.utils import operator_register, parse_node_input from aidge_core.aidge_export_aidge import ROOT_EXPORT -from aidge_core import ExportNode, generate_file, generate_str +from aidge_core.export_utils import ExportNode, generate_file, generate_str from pathlib import Path @operator_register("MaxPooling") diff --git a/aidge_core/aidge_export_aidge/operator_export/producer.py b/aidge_core/aidge_export_aidge/operator_export/producer.py index 93f90e0e599b81ef8b587234666426297c6589a1..3886cffa0b1cc8bc9c4c13e95301f3647954bb43 100644 --- a/aidge_core/aidge_export_aidge/operator_export/producer.py +++ b/aidge_core/aidge_export_aidge/operator_export/producer.py @@ -2,7 +2,7 @@ from aidge_core.aidge_export_aidge.utils import operator_register from aidge_core.export_utils.data_conversion import aidge2c from aidge_core.aidge_export_aidge import ROOT_EXPORT -from aidge_core import dtype, ExportNode, generate_file, generate_str +from aidge_core.export_utils import ExportNode, generate_file, generate_str import numpy as np from pathlib import Path diff --git a/aidge_core/aidge_export_aidge/operator_export/relu.py b/aidge_core/aidge_export_aidge/operator_export/relu.py index c0f4f6afdc35737a8967f51c1859bda0c9773f88..21b368dfade9b0d83cf3919e770b886f4e18b958 100644 --- a/aidge_core/aidge_export_aidge/operator_export/relu.py +++ b/aidge_core/aidge_export_aidge/operator_export/relu.py @@ -1,5 +1,5 @@ from aidge_core.aidge_export_aidge.utils import operator_register, parse_node_input -from aidge_core import ExportNode, generate_str +from aidge_core.export_utils import ExportNode, generate_str from aidge_core.aidge_export_aidge import ROOT_EXPORT from pathlib import Path diff --git a/aidge_core/aidge_export_aidge/operator_export/sub.py b/aidge_core/aidge_export_aidge/operator_export/sub.py index efcdd0924fbcf6944b0fb95a967e1a3e16ccc3c5..24315c921554cb6ac06545dd7961b3c9e767104c 100644 --- a/aidge_core/aidge_export_aidge/operator_export/sub.py +++ b/aidge_core/aidge_export_aidge/operator_export/sub.py @@ -1,5 +1,5 @@ from aidge_core.aidge_export_aidge.utils import operator_register, parse_node_input -from aidge_core import ExportNode, generate_str +from aidge_core.export_utils import ExportNode, generate_str from aidge_core.aidge_export_aidge import ROOT_EXPORT from pathlib import Path diff --git a/aidge_core/export_utils/__init__.py b/aidge_core/export_utils/__init__.py index 6fc846d93301f45b0635cd9b2fabae65fa7be8ab..00e22a8ef948010107f36bbd60a5ae6f93ae5414 100644 --- a/aidge_core/export_utils/__init__.py +++ b/aidge_core/export_utils/__init__.py @@ -1,2 +1,3 @@ -from .node_export import * -from .code_generation import * +from .node_export import ExportNode, ExportNodeCpp +from .code_generation import generate_file, generate_str +from .export_registry import ExportLib, operator_register