Testing Python >= 3.11 and <= 3.12 (based on release 1.4.0)

ci/.gitlab-setup.yml

@@ -2,9 +2,9 @@
 
 .n2_setup_general:
   before_script:
-    - ml lang/Python/3.10.4-GCCcore-11.3.0
+    - ml lang/Python/3.12.3-GCCcore-13.3.0
     - ml tools/git-lfs/3.6.1
-    - ml tools/UnZip/6.0-GCCcore-11.3.0
+    - ml tools/UnZip/6.0-GCCcore-13.3.0
     - ml devel/ncurses/5.9
     - ulimit -s unlimited # Increase stack size limit
 

external_dependencies.yaml

@@ -1,9 +1,4 @@
 git_deps:
-    onnx-passes:
-        url: "https://github.com/iksnagreb/onnx-passes.git"
-        commit: "e5ff48c2292f83d490b0aed11437d953193701d6"
-        pip_install: True
-        install_editable: True
     cnpy:
         url: "https://github.com/maltanar/cnpy.git"
         commit: "8c82362372ce600bbd1cf11d64661ab69d38d7de"

notebooks/pyproject.toml

@@ -2,7 +2,7 @@
 name = "finn-plus-notebooks"
 dynamic = ["version"]
 description = "Notebooks and tutorials for finn-plus"
-requires-python = ">=3.10,<3.12"
+requires-python = ">=3.11,<3.13"
 maintainers = [
     { name = "Felix Jentzsch", email = "felix.jentzsch@upb.de" },
     { name = "Christoph Berganski", email = "christoph.berganski@upb.de" },
@@ -27,7 +27,7 @@ description = "Notebooks and tutorials for finn-plus"
 packages = [{ include = "notebooks", from = ".." }]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.12"
+python = ">=3.11,<3.13"
 ipython = "~8.37.0"            # ipython>=9.0.0 requires python>=3.11
 ipykernel = "~6.29.5"
 jupyter = "~1.1.1"

pyproject.toml

@@ -39,7 +39,7 @@ enable = true
 finn = "finn.interface.run_finn:main"
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.12"
+python = ">=3.11,<3.13"
 pybind11 = "3.0.1"                              # pybind11==3.0.1 already for FIFO sim rework, after rework remove module load
 bitstring = "~4.3.1"
 numpy = "1.26.4"  # numpy<=1.26.4 required by brevitas
@@ -50,9 +50,11 @@ numpy = "1.26.4"  # numpy<=1.26.4 required by brevitas
 # to be upgraded to produce a consistent model, but this in turn cannot be done
 # due to the model IR version support issue...
 scipy = "~1.15.0"
-onnx = "1.17.0"
-onnxruntime = "1.20.1"
-onnxscript = ">=0.6.2"                                # TODO: the onnx-passes installation will overwrite this version
+onnx = "1.21.0"
+onnxruntime = "1.25.1"
+onnxscript = ">=0.7.0"
+onnx-ir = ">=0.1.15"
+onnx-passes = ">=0.4.0"
 protobuf = "5.29.6"
 pyyaml = "~6.0.2"
 mip = "~1.13.0"
@@ -63,7 +65,7 @@ qonnx = "1.0.0"
 termcolor = "^2.5.0"
 rich = "^13.9.4"
 click = "^8.1.8"
-onnxoptimizer = "^0.3.13"
+onnxoptimizer = "^0.4.2"
 pydantic = ">2.0"
 mashumaro = { extras = ["yaml"], version = "^3.15" }
 

src/finn/transformation/streamline/reorder.py

@@ -28,6 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import numpy as np
+import onnxruntime
 import qonnx.core.data_layout as DataLayout
 from copy import deepcopy
 from onnx import TensorProto
@@ -43,11 +44,16 @@
 from qonnx.transformation.infer_shapes import InferShapes
 from qonnx.util.basic import get_by_name
 
+
 # Groups node inputs by dynamic vs. initializer category
 from finn.transformation.util import group_inputs_by_category, is_scalar
 from finn.util.logging import log
 
 
+print("ORT version: " + str(onnxruntime.__version__))
+print("ORT path: " + str(onnxruntime.__file__))
+
+
 class MoveAddPastMul(Transformation):
     """Move add operations past multiply operations on linear segments of the graph.
     The aim is to have them next to each other such that they can be collapsed into

tests/pyproject.toml

@@ -27,7 +27,7 @@ packages = [{ include = "tests", from = ".." }]
 include = ["example_data/**/*"]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.12"
+python = ">=3.11,<3.13"
 pytest = "~8.4.1"
 pytest-metadata = "~3.1.1"
 pytest-html = "~4.1.1"