From e19787f647ac0dc3f3dd359d68e49f3bf7780f19 Mon Sep 17 00:00:00 2001 From: bwintermann Date: Wed, 15 Apr 2026 10:16:19 +0200 Subject: [PATCH 01/12] Testing Python 3.13 with increased ONNX and onnxruntime versions --- ci/.gitlab-setup.yml | 4 ++-- pyproject.toml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/.gitlab-setup.yml b/ci/.gitlab-setup.yml index 7bb7e933fe..a44241cd0b 100644 --- a/ci/.gitlab-setup.yml +++ b/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.13.1-GCCcore-14.2.0 - ml tools/git-lfs/3.6.1 - - ml tools/UnZip/6.0-GCCcore-11.3.0 + - ml tools/UnZip/6.0-GCCcore-14.2.0 - ml devel/ncurses/5.9 - ulimit -s unlimited # Increase stack size limit diff --git a/pyproject.toml b/pyproject.toml index 6577b95938..e50e61f258 100644 --- a/pyproject.toml +++ b/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,8 +50,8 @@ 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" +onnx = "1.21.0" +onnxruntime = "1.24.4" onnxscript = ">=0.5.0" # TODO: the onnx-passes installation will overwrite this version protobuf = "4.25.8" pyyaml = "~6.0.2" From 125146157d64633f48298e67f32b543bc4a83b12 Mon Sep 17 00:00:00 2001 From: bwintermann Date: Wed, 15 Apr 2026 10:34:08 +0200 Subject: [PATCH 02/12] Updated versions across all pyprojects.toml to exclude 3.13 --- ci/.gitlab-setup.yml | 4 ++-- notebooks/pyproject.toml | 4 ++-- pyproject.toml | 2 +- tests/pyproject.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/.gitlab-setup.yml b/ci/.gitlab-setup.yml index a44241cd0b..98430b5b9a 100644 --- a/ci/.gitlab-setup.yml +++ b/ci/.gitlab-setup.yml @@ -2,9 +2,9 @@ .n2_setup_general: before_script: - - ml lang/Python/3.13.1-GCCcore-14.2.0 + - ml lang/Python/3.12.3-GCCcore-13.3.0 - ml tools/git-lfs/3.6.1 - - ml tools/UnZip/6.0-GCCcore-14.2.0 + - ml tools/UnZip/6.0-GCCcore-13.3.0 - ml devel/ncurses/5.9 - ulimit -s unlimited # Increase stack size limit diff --git a/notebooks/pyproject.toml b/notebooks/pyproject.toml index 2d60da9d4a..ee1c0f2e2e 100644 --- a/notebooks/pyproject.toml +++ b/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" diff --git a/pyproject.toml b/pyproject.toml index e50e61f258..d86c4ed7c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ enable = true finn = "finn.interface.run_finn:main" [tool.poetry.dependencies] -python = ">=3.11,<=3.13" +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 diff --git a/tests/pyproject.toml b/tests/pyproject.toml index acbf1ff498..69c2533a7c 100644 --- a/tests/pyproject.toml +++ b/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" From 72dc2fbfed58f90ca02c4aee415d1216022a24a0 Mon Sep 17 00:00:00 2001 From: bwintermann Date: Wed, 15 Apr 2026 10:37:50 +0200 Subject: [PATCH 03/12] Increment onnxoptimizer to latest version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d86c4ed7c4..8635df0794 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,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" } From dfa577e4ecbd07825ac32c3d528aa43b0dc2ab59 Mon Sep 17 00:00:00 2001 From: Christoph Berganski Date: Wed, 15 Apr 2026 12:56:21 +0200 Subject: [PATCH 04/12] [Deps] Update onnx-passes external dependency --- external_dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_dependencies.yaml b/external_dependencies.yaml index a3a51006ee..3fdaed268a 100644 --- a/external_dependencies.yaml +++ b/external_dependencies.yaml @@ -1,7 +1,7 @@ git_deps: onnx-passes: url: "https://github.com/iksnagreb/onnx-passes.git" - commit: "e5ff48c2292f83d490b0aed11437d953193701d6" + commit: "495ceefe5dbefb81d0fa2b2927972a602656a3f6" pip_install: True install_editable: True cnpy: From 5c0abfad5b13ac5281f9b512e221ce80c93d500b Mon Sep 17 00:00:00 2001 From: bwintermann Date: Wed, 15 Apr 2026 15:00:20 +0200 Subject: [PATCH 05/12] Test used ort version --- src/finn/transformation/streamline/reorder.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/finn/transformation/streamline/reorder.py b/src/finn/transformation/streamline/reorder.py index 66ba2ee417..06bf9238e6 100644 --- a/src/finn/transformation/streamline/reorder.py +++ b/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,15 @@ 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__)) + + 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 From ee36cb5f7fbc9d212f050f261c82bc7831e5ffcc Mon Sep 17 00:00:00 2001 From: bwintermann Date: Wed, 15 Apr 2026 15:47:36 +0200 Subject: [PATCH 06/12] Check ORT Path --- src/finn/transformation/streamline/reorder.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/finn/transformation/streamline/reorder.py b/src/finn/transformation/streamline/reorder.py index 06bf9238e6..682cf54097 100644 --- a/src/finn/transformation/streamline/reorder.py +++ b/src/finn/transformation/streamline/reorder.py @@ -51,6 +51,7 @@ print("ORT version: " + str(onnxruntime.__version__)) +print("ORT path: " + str(onnxruntime.__file__)) class MoveAddPastMul(Transformation): From 9532c233fcee9882fc0997b7dd3f6a5d555c77c8 Mon Sep 17 00:00:00 2001 From: Christoph Berganski Date: Thu, 16 Apr 2026 11:58:40 +0200 Subject: [PATCH 07/12] [Deps] Update onnx-passes external dependency --- external_dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_dependencies.yaml b/external_dependencies.yaml index 3fdaed268a..620176b2f1 100644 --- a/external_dependencies.yaml +++ b/external_dependencies.yaml @@ -1,7 +1,7 @@ git_deps: onnx-passes: url: "https://github.com/iksnagreb/onnx-passes.git" - commit: "495ceefe5dbefb81d0fa2b2927972a602656a3f6" + commit: "21d9e6384a317ad8d7a0b4e545b16ff7bfb537fe" pip_install: True install_editable: True cnpy: From 60f6acd9d727bfbbb7a9814b3ce71c1b56e5f23e Mon Sep 17 00:00:00 2001 From: Christoph Berganski Date: Wed, 15 Apr 2026 12:56:21 +0200 Subject: [PATCH 08/12] [Deps] Update onnx-passes external dependency --- external_dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_dependencies.yaml b/external_dependencies.yaml index 12309e7b46..3372cd8318 100644 --- a/external_dependencies.yaml +++ b/external_dependencies.yaml @@ -1,7 +1,7 @@ git_deps: onnx-passes: url: "https://github.com/iksnagreb/onnx-passes.git" - commit: "e5ff48c2292f83d490b0aed11437d953193701d6" + commit: "495ceefe5dbefb81d0fa2b2927972a602656a3f6" pip_install: True install_editable: True cnpy: From 68ab239a225fd348c84f148742c0851016e9c4e7 Mon Sep 17 00:00:00 2001 From: Christoph Berganski Date: Thu, 16 Apr 2026 11:58:40 +0200 Subject: [PATCH 09/12] [Deps] Update onnx-passes external dependency --- external_dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_dependencies.yaml b/external_dependencies.yaml index 3372cd8318..bcef2dfabc 100644 --- a/external_dependencies.yaml +++ b/external_dependencies.yaml @@ -1,7 +1,7 @@ git_deps: onnx-passes: url: "https://github.com/iksnagreb/onnx-passes.git" - commit: "495ceefe5dbefb81d0fa2b2927972a602656a3f6" + commit: "21d9e6384a317ad8d7a0b4e545b16ff7bfb537fe" pip_install: True install_editable: True cnpy: From cf7248e8c276ff3812c6839a2dc3a2386e750154 Mon Sep 17 00:00:00 2001 From: Christoph Berganski Date: Tue, 21 Apr 2026 14:08:52 +0200 Subject: [PATCH 10/12] [Deps] Update onnx-passes external dependency --- external_dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_dependencies.yaml b/external_dependencies.yaml index bcef2dfabc..2bf2e822a6 100644 --- a/external_dependencies.yaml +++ b/external_dependencies.yaml @@ -1,7 +1,7 @@ git_deps: onnx-passes: url: "https://github.com/iksnagreb/onnx-passes.git" - commit: "21d9e6384a317ad8d7a0b4e545b16ff7bfb537fe" + commit: "0ca7d1e36fe4ba2f0734cba996f447a73eb02a99" pip_install: True install_editable: True cnpy: From 85734c74e5d1d664d44e617ce80135c1174d9643 Mon Sep 17 00:00:00 2001 From: Christoph Berganski Date: Tue, 21 Apr 2026 16:52:43 +0200 Subject: [PATCH 11/12] [Deps] Update onnx-passes to track >=0.4.0 from PyPI Also updates and relaxes various other dependencies and the minimum python version (now 3.11) making this dependent on #197. --- external_dependencies.yaml | 5 ----- pyproject.toml | 12 +++++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/external_dependencies.yaml b/external_dependencies.yaml index 2bf2e822a6..c1bc116da6 100644 --- a/external_dependencies.yaml +++ b/external_dependencies.yaml @@ -1,9 +1,4 @@ git_deps: - onnx-passes: - url: "https://github.com/iksnagreb/onnx-passes.git" - commit: "0ca7d1e36fe4ba2f0734cba996f447a73eb02a99" - pip_install: True - install_editable: True cnpy: url: "https://github.com/maltanar/cnpy.git" commit: "8c82362372ce600bbd1cf11d64661ab69d38d7de" diff --git a/pyproject.toml b/pyproject.toml index 4f0f416646..3b9b8ad879 100644 --- a/pyproject.toml +++ b/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.12" 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.17.0" +onnxruntime = ">=1.20.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" } From fa81c03a6c481dca9c040f62b379fb32926b6f01 Mon Sep 17 00:00:00 2001 From: bwintermann Date: Tue, 28 Apr 2026 13:24:59 +0200 Subject: [PATCH 12/12] Fixed dependency merge conflicts in pyproject --- pyproject.toml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f82783b6f4..6494f933c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,17 +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" -<<<<<<< HEAD onnx = "1.21.0" -onnxruntime = "1.24.4" -onnxscript = ">=0.6.2" # TODO: the onnx-passes installation will overwrite this version -======= -onnx = ">=1.17.0" -onnxruntime = ">=1.20.1" +onnxruntime = "1.25.1" onnxscript = ">=0.7.0" onnx-ir = ">=0.1.15" onnx-passes = ">=0.4.0" ->>>>>>> origin/deps/onnx-passes protobuf = "5.29.6" pyyaml = "~6.0.2" mip = "~1.13.0"