Convert ONNX models to version 17+ as part of importing them.

iree_tests/.gitignore

@@ -1,3 +1,7 @@
+# TODO(scotttodd): compile into a build/temp dir instead of the source dir
 *.vmfb
-# TODO(scotttodd): compile into a build dir instead of the source dir
+# TODO(scotttodd): convert into a build/temp dir instead of the source dir
+*.onnx
+
+# Leftovers from an older iteration of compile/run test scripts.
 config_*.txt

iree_tests/onnx/import_tests.py

@@ -20,6 +20,9 @@
 ONNX_REPO_GENERATED_TESTS_ROOT = ONNX_REPO_ROOT / "onnx/backend/test/data"
 NODE_TESTS_ROOT = ONNX_REPO_GENERATED_TESTS_ROOT / "node"
 
+# Convert test cases to at least this version using The ONNX Version Converter.
+ONNX_CONVERTER_OUTPUT_MIN_VERSION = 17
+
 # Write imported files to our own 'generated' folder.
 GENERATED_FILES_OUTPUT_ROOT = REPO_ROOT / "iree_tests/onnx/node/generated"
 
@@ -71,15 +74,32 @@ def import_onnx_files(test_dir_path, imported_dir_path):
     test_data_flagfile_path = imported_dir_path / "test_data_flags.txt"
     test_data_flagfile_lines = []
 
-    # Import model.onnx to model.mlir.
-    # TODO(scotttodd): copy the .onnx file into the generated folder? Useful for reproducing
-    #                  could also add a symlink or other files with info
-    #                  e.g. importer tool / version / flags used, reproducer command
-    onnx_model_path = test_dir_path / "model.onnx"
+    # Convert model.onnx up to ONNX_CONVERTER_OUTPUT_MIN_VERSION if needed.
+    # TODO(scotttodd): stamp some info e.g. importer tool / version / flags used
+    original_model_path = test_dir_path / "model.onnx"
+    converted_model_path = imported_dir_path / "model.onnx"
+
+    original_model = onnx.load_model(original_model_path)
+    original_version = original_model.opset_import[0].version
+    if original_version < ONNX_CONVERTER_OUTPUT_MIN_VERSION:
+        try:
+            converted_model = version_converter.convert_version(
+                original_model, ONNX_CONVERTER_OUTPUT_MIN_VERSION
+            )
+            onnx.save(converted_model, converted_model_path)
+        except:
+            # Conversion failed. Do our best with the original file.
+            # print(f"WARNING: ONNX conversion failed for {test_dir_path.name}")
+            shutil.copy(original_model_path, converted_model_path)
+    else:
+        # No conversion needed.
+        shutil.copy(original_model_path, converted_model_path)
+
+    # Import converted model.onnx to model.mlir.
     imported_model_path = imported_dir_path / "model.mlir"
     exec_args = [
         "iree-import-onnx",
-        str(onnx_model_path),
+        str(converted_model_path),
         "-o",
         str(imported_model_path),
     ]
@@ -101,7 +121,7 @@ def import_onnx_files(test_dir_path, imported_dir_path):
     test_data_dir = test_data_dirs[0]
     test_inputs = list(test_data_dir.glob("input_*.pb"))
     test_outputs = list(test_data_dir.glob("output_*.pb"))
-    model = onnx.load(onnx_model_path)
+    model = onnx.load(converted_model_path)
     for i in range(len(test_inputs)):
         test_input = test_inputs[i]
         t = convert_io_proto(test_input, model.graph.input[i].type)