Merge pull request #96 from fastmachinelearning/fix/tf2onnx-1.16.1

Try newer tf2onnx version to get CI back in green
fastmachinelearning · Feb 5, 2024 · 813128f · 813128f
2 parents 62223f3 + fd3b319
commit 813128f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -69,7 +69,7 @@ exclude =
 # Note: pyparsing is actually needed by QKeras, but missing as dependency
 qkeras =
     pyparsing
-    tf2onnx>=1.12.1
+    tf2onnx>=1.16.1
     tensorflow==2.9.0
     QKeras==0.9.0
 

diff --git a/tests/transformation/test_batchnorm_to_affine.py b/tests/transformation/test_batchnorm_to_affine.py
@@ -41,7 +41,7 @@
 from qonnx.transformation.infer_shapes import InferShapes
 from qonnx.util.basic import gen_finn_dt_tensor, qonnx_make_model
 
-download_url = "https://github.com/onnx/models/raw/main/vision/classification"
+download_url = "https://github.com/onnx/models/raw/main/validated/vision/classification"
 download_url += "/shufflenet/model/shufflenet-9.onnx"
 export_onnx_path = download_url.split("/")[-1]
 

diff --git a/tests/transformation/test_qcdq_to_qonnx.py b/tests/transformation/test_qcdq_to_qonnx.py
@@ -39,7 +39,9 @@
 
 model_details = {
     "MobileNetv2-w8a8": {
-        "url": ("https://github.com/onnx/models/raw/main/vision/classification/mobilenet/model/mobilenetv2-12-qdq.onnx"),
+        "url": (
+            "https://github.com/onnx/models/raw/main/validated/vision/classification/mobilenet/model/mobilenetv2-12-qdq.onnx"
+        ),
         "input_shape": (1, 3, 224, 224),
         "input_range": (-1, +1),
         "exp_q_nodes": 171,

diff --git a/tests/transformation/test_renaming.py b/tests/transformation/test_renaming.py
@@ -77,7 +77,7 @@ def test_renaming():
 
 
 def test_rename_multi_io_tinyyolov3():
-    download_url = "https://github.com/onnx/models/raw/main/vision/object_detection_segmentation"
+    download_url = "https://github.com/onnx/models/raw/main/validated/vision/object_detection_segmentation"
     download_url += "/tiny-yolov3/model/tiny-yolov3-11.onnx"
     export_onnx_path = download_url.split("/")[-1]
     ureq.urlretrieve(download_url, export_onnx_path)