diff --git a/aidge_core/__init__.py b/aidge_core/__init__.py index 92dcc121d5b455e7772d8a3c5dc8500ac081ab4e..989b6e2698108393f514289fdfbca77cca101a88 100644 --- a/aidge_core/__init__.py +++ b/aidge_core/__init__.py @@ -8,5 +8,5 @@ http://www.eclipse.org/legal/epl-2.0. SPDX-License-Identifier: EPL-2.0 """ from . import * # import so generated by PyBind -from aidge_core.export import ExportNode, generate_file, generate_str -import aidge_core.utils +from .export import ExportNode, generate_file, generate_str +import utils diff --git a/aidge_core/export/node_export.py b/aidge_core/export/node_export.py index 477989b037da6f6229bd275ff22974d9ef307848..dd01895995d810df1b25619ce6ba1498c138ec3b 100644 --- a/aidge_core/export/node_export.py +++ b/aidge_core/export/node_export.py @@ -1,4 +1,4 @@ -import aidge_core +from aidge_core import Node, Attributes from abc import ABC, abstractmethod @@ -8,7 +8,7 @@ class ExportNode(ABC): """ @abstractmethod - def __init__(self, aidge_node: aidge_core.Node) -> None: + def __init__(self, aidge_node: Node) -> None: """Create ExportNode and retieve attirubtes from ``aidge_node``: - name: aidge Node name @@ -21,7 +21,7 @@ class ExportNode(ABC): self.operator = aidge_node.get_operator() self.name = self.node.name() self.attributes = {} # Attributes are auto fetched from aidge operators - if isinstance(self.operator, aidge_core.Attributes): + if isinstance(self.operator, Attributes): for attr_name in self.operator.get_attrs_name(): self.attributes[attr_name] = self.operator.get_attr(attr_name) diff --git a/pyproject.toml b/pyproject.toml index 48259bfac8d958df9c1df4929b490c0b44177dc1..cfcb9a29954d0128c98442163a16afb7d74b024f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ dynamic = ["version"] # defined in tool.setuptools_scm requires = [ "setuptools>=64", "setuptools_scm[toml]==7.1.0", - "cmake>=3.29", + "cmake>=3.27.9", "toml" ] build-backend = "setuptools.build_meta" @@ -369,5 +369,3 @@ ignored-argument-names = "_.*|^ignored_|^unused_" # List of qualified module names which can have objects that can redefine # builtins. redefining-builtins-modules = ["six.moves", "past.builtins", "future.builtins", "builtins", "io"] - - diff --git a/setup.py b/setup.py index 11f07e68902bac747dab656db04b4be5ff92d6ea..3452f25fc1fbedef1625b0c431b1bbbef215f954 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import sys import os -import sysconfig import shutil import pathlib import multiprocessing