diff --git a/notebooks/advanced/1_custom_transformation_pass.ipynb b/notebooks/advanced/1_custom_transformation_pass.ipynb index a9345401e28b89ba3a206b81e7c3b022bedae023..9c54d6f26913e558867b2f800b424f4157f47491 100644 --- a/notebooks/advanced/1_custom_transformation_pass.ipynb +++ b/notebooks/advanced/1_custom_transformation_pass.ipynb @@ -120,7 +120,7 @@ } ], "source": [ - "from finn.transformation import Transformation\n", + "from finn.transformation.base import Transformation\n", "\n", "showSrc(Transformation)" ] @@ -199,7 +199,7 @@ "metadata": {}, "outputs": [], "source": [ - "from finn.transformation import Transformation\n", + "from finn.transformation.base import Transformation\n", "\n", "class ConvertSubToAdd(Transformation):\n", " def apply(self, model):\n", @@ -352,7 +352,7 @@ } ], "source": [ - "from finn.transformation import NodeLocalTransformation\n", + "from finn.transformation.base import NodeLocalTransformation\n", "\n", "showSrc(NodeLocalTransformation)" ] diff --git a/src/finn/transformation/fpgadataflow/annotate_cycles.py b/src/finn/transformation/fpgadataflow/annotate_cycles.py index 521c84952daf25982e574421dfba3ff0f7df91ae..2c547203df94308b929a7989f1a9102bd3002fed 100644 --- a/src/finn/transformation/fpgadataflow/annotate_cycles.py +++ b/src/finn/transformation/fpgadataflow/annotate_cycles.py @@ -27,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import finn.custom_op.registry as registry -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.transformation.move_reshape import _is_fpgadataflow_node from finn.core.modelwrapper import ModelWrapper from finn.custom_op.registry import getCustomOp diff --git a/src/finn/transformation/fpgadataflow/annotate_resources.py b/src/finn/transformation/fpgadataflow/annotate_resources.py index d6ff058848700b50dadb7a6ed0ff6c07b7eeb4a3..4e501510110ef724c6a67f6214654b5454b30a77 100644 --- a/src/finn/transformation/fpgadataflow/annotate_resources.py +++ b/src/finn/transformation/fpgadataflow/annotate_resources.py @@ -27,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import finn.custom_op.registry as registry -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.transformation.move_reshape import _is_fpgadataflow_node from finn.analysis.fpgadataflow.res_estimation import res_estimation from finn.analysis.fpgadataflow.hls_synth_res_estimation import hls_synth_res_estimation diff --git a/src/finn/transformation/fpgadataflow/cleanup.py b/src/finn/transformation/fpgadataflow/cleanup.py index 248a99b57aed7f38f63cc25ad7ecf93bd1930e63..f089317074eb2bded4675f6fd2e22fdaeb4b6a82 100644 --- a/src/finn/transformation/fpgadataflow/cleanup.py +++ b/src/finn/transformation/fpgadataflow/cleanup.py @@ -31,7 +31,7 @@ import shutil import finn.custom_op.registry as registry from finn.util.fpgadataflow import is_fpgadataflow_node -from finn.transformation import Transformation +from finn.transformation.base import Transformation class CleanUp(Transformation): diff --git a/src/finn/transformation/fpgadataflow/compile_cppsim.py b/src/finn/transformation/fpgadataflow/compile_cppsim.py index ddf00c799b8a53c428d0854551d0078a6e264111..e17feb4683189ad2f8174f0564a877f84870b51d 100644 --- a/src/finn/transformation/fpgadataflow/compile_cppsim.py +++ b/src/finn/transformation/fpgadataflow/compile_cppsim.py @@ -28,7 +28,7 @@ import finn.custom_op.registry as registry from finn.util.fpgadataflow import is_fpgadataflow_node -from finn.transformation import NodeLocalTransformation +from finn.transformation.base import NodeLocalTransformation class CompileCppSim(NodeLocalTransformation): diff --git a/src/finn/transformation/fpgadataflow/convert_to_hls_layers.py b/src/finn/transformation/fpgadataflow/convert_to_hls_layers.py index d4d5b006493b8db1da0184e98ba35493d3e6ccbd..d6f2e04f762a6b67ace989fa802829fd3e5a6fb5 100644 --- a/src/finn/transformation/fpgadataflow/convert_to_hls_layers.py +++ b/src/finn/transformation/fpgadataflow/convert_to_hls_layers.py @@ -32,7 +32,7 @@ import numpy as np import warnings from finn.core.datatype import DataType -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.custom_op.registry import getCustomOp from finn.transformation.infer_shapes import InferShapes from finn.transformation.infer_datatypes import InferDataTypes diff --git a/src/finn/transformation/fpgadataflow/create_dataflow_partition.py b/src/finn/transformation/fpgadataflow/create_dataflow_partition.py index fb8b4358abd772d13c355f797649dc3b51975b4d..90a92d11ce621897e3e6c687f57b1cdf77d08fba 100644 --- a/src/finn/transformation/fpgadataflow/create_dataflow_partition.py +++ b/src/finn/transformation/fpgadataflow/create_dataflow_partition.py @@ -30,7 +30,7 @@ import copy from onnx import helper -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import get_by_name, make_build_dir diff --git a/src/finn/transformation/fpgadataflow/create_stitched_ip.py b/src/finn/transformation/fpgadataflow/create_stitched_ip.py index 0def25d8429f5d3f6c02a9db656650bc1baba6ee..3470e9525d590303eca1f8700fe4b79c4e03d38f 100644 --- a/src/finn/transformation/fpgadataflow/create_stitched_ip.py +++ b/src/finn/transformation/fpgadataflow/create_stitched_ip.py @@ -30,7 +30,7 @@ import os import warnings import subprocess -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import get_by_name, make_build_dir from finn.custom_op.registry import getCustomOp from finn.util.basic import get_num_default_workers diff --git a/src/finn/transformation/fpgadataflow/floorplan.py b/src/finn/transformation/fpgadataflow/floorplan.py index 1d9a51875499d77f384c03f54009a9dd1001dea0..eaade4a335258bb2ffd7ce0f87da8ae7c3fd00b3 100644 --- a/src/finn/transformation/fpgadataflow/floorplan.py +++ b/src/finn/transformation/fpgadataflow/floorplan.py @@ -27,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from finn.custom_op.registry import getCustomOp -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import get_by_name diff --git a/src/finn/transformation/fpgadataflow/hlssynth_ip.py b/src/finn/transformation/fpgadataflow/hlssynth_ip.py index 8315b6ec11e3d0bc5e2bf97e7c11817ae8b5a5b1..e79d70544c5e8d2b9060e354d7713b8405ae9c7f 100644 --- a/src/finn/transformation/fpgadataflow/hlssynth_ip.py +++ b/src/finn/transformation/fpgadataflow/hlssynth_ip.py @@ -29,7 +29,7 @@ import os import finn.custom_op.registry as registry from finn.util.fpgadataflow import is_fpgadataflow_node -from finn.transformation import NodeLocalTransformation +from finn.transformation.base import NodeLocalTransformation import warnings diff --git a/src/finn/transformation/fpgadataflow/insert_dwc.py b/src/finn/transformation/fpgadataflow/insert_dwc.py index 3fe60292e8f54a8cdf394b5e09f8a3d2bca7605c..195a005ff87b43c6b64017354895693cd811a48e 100644 --- a/src/finn/transformation/fpgadataflow/insert_dwc.py +++ b/src/finn/transformation/fpgadataflow/insert_dwc.py @@ -2,7 +2,7 @@ from onnx import TensorProto from onnx import helper as oh from finn.custom_op.registry import getCustomOp -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.fpgadataflow import is_fpgadataflow_node diff --git a/src/finn/transformation/fpgadataflow/insert_fifo.py b/src/finn/transformation/fpgadataflow/insert_fifo.py index 6f7fde0c4faba09e584eb578819f44c18639bc9d..1c26642888f29e8dd08046e4de01ae8fa62b10e7 100644 --- a/src/finn/transformation/fpgadataflow/insert_fifo.py +++ b/src/finn/transformation/fpgadataflow/insert_fifo.py @@ -2,7 +2,7 @@ from onnx import TensorProto from onnx import helper as oh from finn.custom_op.registry import getCustomOp -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.fpgadataflow import is_fpgadataflow_node import numpy as np diff --git a/src/finn/transformation/fpgadataflow/insert_iodma.py b/src/finn/transformation/fpgadataflow/insert_iodma.py index 72e5ec4fdd721ecf549adaf7ddd38db4636bce27..feaa534e1e9d2fb527293a617cc622a5f71c24cb 100644 --- a/src/finn/transformation/fpgadataflow/insert_iodma.py +++ b/src/finn/transformation/fpgadataflow/insert_iodma.py @@ -31,7 +31,7 @@ from onnx import helper as oh from finn.util.basic import get_by_name from finn.custom_op.registry import getCustomOp -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.transformation.general import SortGraph import finn.core.data_layout as DataLayout import math diff --git a/src/finn/transformation/fpgadataflow/insert_tlastmarker.py b/src/finn/transformation/fpgadataflow/insert_tlastmarker.py index bbb0e43fda464e919a7d8c9dcd25e08a49b33cec..8ffb083217bb3a7e379112b3da102487c0cd50c2 100644 --- a/src/finn/transformation/fpgadataflow/insert_tlastmarker.py +++ b/src/finn/transformation/fpgadataflow/insert_tlastmarker.py @@ -30,7 +30,7 @@ from onnx import TensorProto from onnx import helper as oh from finn.custom_op.registry import getCustomOp -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import get_by_name import numpy as np diff --git a/src/finn/transformation/fpgadataflow/make_deployment.py b/src/finn/transformation/fpgadataflow/make_deployment.py index 2880e4aba20564f50a0acdff5e8c728714c84b5c..6d37f567c9a20cf692df126c1c3560324b61d06d 100644 --- a/src/finn/transformation/fpgadataflow/make_deployment.py +++ b/src/finn/transformation/fpgadataflow/make_deployment.py @@ -32,7 +32,7 @@ import subprocess from distutils.dir_util import copy_tree from shutil import copy -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import make_build_dir import finn.transformation.fpgadataflow.templates as templates diff --git a/src/finn/transformation/fpgadataflow/make_pynq_driver.py b/src/finn/transformation/fpgadataflow/make_pynq_driver.py index 2f4bee159055330e5a429b0751d2496ea6b00859..e8e3059240556296ca635ffcc36665fb18beda3b 100644 --- a/src/finn/transformation/fpgadataflow/make_pynq_driver.py +++ b/src/finn/transformation/fpgadataflow/make_pynq_driver.py @@ -28,7 +28,7 @@ import shutil -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import gen_finn_dt_tensor, make_build_dir import finn.util.data_packing as dpk import finn.core.datatype as dtp diff --git a/src/finn/transformation/fpgadataflow/make_zynq_proj.py b/src/finn/transformation/fpgadataflow/make_zynq_proj.py index e263c450af5d2dca09a79b7757a0c0d67bdf86ff..1a4b67d1e7adb86b5a7515eb0ff14b780eea0585 100644 --- a/src/finn/transformation/fpgadataflow/make_zynq_proj.py +++ b/src/finn/transformation/fpgadataflow/make_zynq_proj.py @@ -30,7 +30,7 @@ import os import subprocess from finn.custom_op.registry import getCustomOp -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.core.modelwrapper import ModelWrapper from finn.util.basic import get_by_name, make_build_dir from finn.util.basic import get_num_default_workers diff --git a/src/finn/transformation/fpgadataflow/minimize_accumulator_width.py b/src/finn/transformation/fpgadataflow/minimize_accumulator_width.py index 2c54a5efbd3b28f0fbfd074b512929edab234e78..0a0c45b6bedeabe7cfa1c7209ea74b6876b828b2 100644 --- a/src/finn/transformation/fpgadataflow/minimize_accumulator_width.py +++ b/src/finn/transformation/fpgadataflow/minimize_accumulator_width.py @@ -27,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from finn.custom_op.registry import getCustomOp -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.fpgadataflow import is_fpgadataflow_node diff --git a/src/finn/transformation/fpgadataflow/prepare_cppsim.py b/src/finn/transformation/fpgadataflow/prepare_cppsim.py index 6eae560e1191642cfaf85d92c6d0fcf644630973..26354bdf70e10bfcddfbaf732a214865c6feb8f5 100644 --- a/src/finn/transformation/fpgadataflow/prepare_cppsim.py +++ b/src/finn/transformation/fpgadataflow/prepare_cppsim.py @@ -31,7 +31,7 @@ import os import finn.custom_op.registry as registry from finn.util.basic import make_build_dir from finn.util.fpgadataflow import is_fpgadataflow_node -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import get_num_default_workers import multiprocessing as mp import copy diff --git a/src/finn/transformation/fpgadataflow/prepare_ip.py b/src/finn/transformation/fpgadataflow/prepare_ip.py index 21f8e0052d5f2d60f11f33846b483d3f556d1188..53cb0af163b853c0a0352d8562cca66b3ecf6068 100644 --- a/src/finn/transformation/fpgadataflow/prepare_ip.py +++ b/src/finn/transformation/fpgadataflow/prepare_ip.py @@ -28,7 +28,7 @@ import os import finn.custom_op.registry as registry -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import make_build_dir from finn.util.fpgadataflow import is_fpgadataflow_node import warnings diff --git a/src/finn/transformation/fpgadataflow/prepare_rtlsim.py b/src/finn/transformation/fpgadataflow/prepare_rtlsim.py index 8c28ab7e2376de392b0fdd628c70e854011dc406..d2ec5561a349d5fc83f02870c1a682dba8433e43 100644 --- a/src/finn/transformation/fpgadataflow/prepare_rtlsim.py +++ b/src/finn/transformation/fpgadataflow/prepare_rtlsim.py @@ -31,7 +31,7 @@ from finn.util.fpgadataflow import is_fpgadataflow_node from finn.transformation.fpgadataflow.replace_verilog_relpaths import ( ReplaceVerilogRelPaths, ) -from finn.transformation import NodeLocalTransformation +from finn.transformation.base import NodeLocalTransformation try: from pyverilator import PyVerilator diff --git a/src/finn/transformation/fpgadataflow/replace_verilog_relpaths.py b/src/finn/transformation/fpgadataflow/replace_verilog_relpaths.py index e63ae4e0203188d9664f432f75e36994e8a71ac5..c577704129fa564f5e0e1e256623ff10125cf5ac 100644 --- a/src/finn/transformation/fpgadataflow/replace_verilog_relpaths.py +++ b/src/finn/transformation/fpgadataflow/replace_verilog_relpaths.py @@ -30,7 +30,7 @@ import os import finn.custom_op.registry as registry from finn.util.fpgadataflow import is_fpgadataflow_node -from finn.transformation import Transformation +from finn.transformation.base import Transformation class ReplaceVerilogRelPaths(Transformation): diff --git a/src/finn/transformation/fpgadataflow/set_exec_mode.py b/src/finn/transformation/fpgadataflow/set_exec_mode.py index 40996e5f64fb812ea3766b71a9a8275514dec4a0..6a76031f4c76831f514b77aee6cd3c560b3b9910 100644 --- a/src/finn/transformation/fpgadataflow/set_exec_mode.py +++ b/src/finn/transformation/fpgadataflow/set_exec_mode.py @@ -28,7 +28,7 @@ import finn.custom_op.registry as registry from finn.util.fpgadataflow import is_fpgadataflow_node -from finn.transformation import Transformation +from finn.transformation.base import Transformation class SetExecMode(Transformation): diff --git a/src/finn/transformation/fpgadataflow/synth_ooc.py b/src/finn/transformation/fpgadataflow/synth_ooc.py index 8fd7e4724ef7f255b1435d5ab5e680d155d39487..acc20e4ad0d0f4a17b20fd77625e9954f09e69aa 100644 --- a/src/finn/transformation/fpgadataflow/synth_ooc.py +++ b/src/finn/transformation/fpgadataflow/synth_ooc.py @@ -29,7 +29,7 @@ import os from shutil import copy2 -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.vivado import out_of_context_synth from finn.util.basic import make_build_dir diff --git a/src/finn/transformation/fpgadataflow/vitis_build.py b/src/finn/transformation/fpgadataflow/vitis_build.py index 482dc8d784c66faef9392093c7c857630304eef3..2e1f3fee2a3ba06f1feb192b9c21e6a5671ad48b 100644 --- a/src/finn/transformation/fpgadataflow/vitis_build.py +++ b/src/finn/transformation/fpgadataflow/vitis_build.py @@ -30,7 +30,7 @@ import os import subprocess from finn.core.modelwrapper import ModelWrapper -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.custom_op.registry import getCustomOp from finn.transformation.fpgadataflow.create_dataflow_partition import ( diff --git a/src/finn/transformation/move_reshape.py b/src/finn/transformation/move_reshape.py index 9943d371dad79a977b61810bcddafdcba505d6cc..a07eaf142293487237b3f2b93460ba492eb5368d 100644 --- a/src/finn/transformation/move_reshape.py +++ b/src/finn/transformation/move_reshape.py @@ -1,4 +1,4 @@ -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import get_by_name diff --git a/src/finn/transformation/streamline/__init__.py b/src/finn/transformation/streamline/__init__.py index bf0307031b4a9158ee2eb39ee30842e6c5a686b7..e78b798ff6f31ff705b733d47dcfe7bcdc6aa127 100644 --- a/src/finn/transformation/streamline/__init__.py +++ b/src/finn/transformation/streamline/__init__.py @@ -30,7 +30,7 @@ from pkgutil import extend_path __path__ = extend_path(__path__, __name__) -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.transformation.infer_datatypes import InferDataTypes from finn.transformation.general import ( ConvertSubToAdd, diff --git a/src/finn/transformation/streamline/absorb.py b/src/finn/transformation/streamline/absorb.py index 0f2c5525d91263b44002677b505087d38408333a..fa2d7a714ad894ebb19099c7ed73e42e12ffdf44 100644 --- a/src/finn/transformation/streamline/absorb.py +++ b/src/finn/transformation/streamline/absorb.py @@ -32,7 +32,7 @@ import warnings from finn.core.datatype import DataType import finn.core.data_layout as DataLayout -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.util.basic import get_by_name from finn.custom_op.registry import getCustomOp from finn.transformation.infer_shapes import InferShapes diff --git a/src/finn/transformation/streamline/collapse_repeated.py b/src/finn/transformation/streamline/collapse_repeated.py index 769bed841ce07c1c9c62f762de4b2c0937a6d68f..19f1ec3e836f3ec38aa4b716f5d6a25ca0782197 100644 --- a/src/finn/transformation/streamline/collapse_repeated.py +++ b/src/finn/transformation/streamline/collapse_repeated.py @@ -28,7 +28,7 @@ from onnx import helper as oh -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.transformation.infer_shapes import InferShapes from finn.core.datatype import DataType diff --git a/src/finn/transformation/streamline/remove.py b/src/finn/transformation/streamline/remove.py index ddc4233ddafbc70c4d20d316ea72ea6bba1b82a8..12c6984c6e66e1917d2a1e0a74c8620ccb6afabc 100644 --- a/src/finn/transformation/streamline/remove.py +++ b/src/finn/transformation/streamline/remove.py @@ -27,10 +27,11 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from finn.transformation import Transformation +from finn.transformation.base import Transformation from finn.transformation.infer_shapes import InferShapes import numpy as np + class RemoveIdentityOps(Transformation): """Remove identity ops like Add/Sub with zero or Mul/Div with one""" diff --git a/src/finn/transformation/streamline/reorder.py b/src/finn/transformation/streamline/reorder.py index f4c1dc1306b67e5807c25cfb08c961729dbfbdf6..bae3c9f22f4e5b2a525f15d1d948e42a4087953a 100644 --- a/src/finn/transformation/streamline/reorder.py +++ b/src/finn/transformation/streamline/reorder.py @@ -31,7 +31,7 @@ import warnings from onnx import helper as oh from onnx import TensorProto -from finn.transformation import Transformation +from finn.transformation.base import Transformation import finn.core.data_layout as DataLayout from finn.transformation.infer_shapes import InferShapes from finn.transformation.infer_datatypes import InferDataTypes diff --git a/src/finn/transformation/streamline/round_thresholds.py b/src/finn/transformation/streamline/round_thresholds.py index 8626ef40619b067c6672c9017ddcb747998c3f2c..ba476504a4213a7d004113c39e2285beeecdddec 100644 --- a/src/finn/transformation/streamline/round_thresholds.py +++ b/src/finn/transformation/streamline/round_thresholds.py @@ -28,7 +28,7 @@ import numpy as np -from finn.transformation import Transformation +from finn.transformation.base import Transformation class RoundAndClipThresholds(Transformation): diff --git a/src/finn/transformation/streamline/sign_to_thres.py b/src/finn/transformation/streamline/sign_to_thres.py index d2b51df7a43c830516897e6bf7d2210698269da8..4e35012ceb4f84284ff2a96a60e4a9bd58a65cce 100644 --- a/src/finn/transformation/streamline/sign_to_thres.py +++ b/src/finn/transformation/streamline/sign_to_thres.py @@ -30,7 +30,7 @@ import numpy as np from onnx import helper as oh from finn.core.datatype import DataType -from finn.transformation import Transformation +from finn.transformation.base import Transformation class ConvertSignToThres(Transformation):