Merge branch 'fac_test_model_gen' into 'master'

Modify script to facilitate generating test model file.

See merge request ai/esp-dl!188

Author: sun-xiangyu

tools/ops_test/config/model_cfg.toml

@@ -1,11 +1,9 @@
 [meta]
     seed = 0
-    quant_bits = 8          # Only support 8 or 16 now.
-    batch_size = 32
-    calib_steps = 32         # The minimum value for calib_steps is 8.
+    batch_size = 1
+    calib_steps = 8         # The minimum value for calib_steps is 8.
     model_version = 1
-    target = "esp32p4"
-
+    opset = 13
 
 [models_test]
     [models_test.picodet]

tools/ops_test/gen_test_cases.py

@@ -216,47 +216,67 @@ def get_op_set(op_test_config, ops):
         help="the version of the test case, (defaults: v1.0)",
     )
     parser.add_argument("--ops", nargs="+", type=str, help="An array of ops")
+    parser.add_argument(
+        "--models", type=str, default=None, help="Specify the model to test."
+    )
     args = parser.parse_args()
 
     # load config
     config = toml.load(args.config)
-    op_test_config = config["ops_test"]
 
-    # generate test cases
-    op_set = get_op_set(op_test_config, args.ops)
+    if not args.models:
+        op_test_config = config["ops_test"]
+
+        # generate test cases
+        op_set = get_op_set(op_test_config, args.ops)
 
-    for op_type in op_set:
-        pkg = importlib.import_module(op_test_config[op_type]["package"])
-        op_configs = op_test_config[op_type]["cfg"]
-        op_test_func = op_test_config[op_type]["test_func"]
-        quant_bits = op_test_config[op_type].get("quant_bits", [])
+        for op_type in op_set:
+            pkg = importlib.import_module(op_test_config[op_type]["package"])
+            op_configs = op_test_config[op_type]["cfg"]
+            op_test_func = op_test_config[op_type]["test_func"]
+            quant_bits = op_test_config[op_type].get("quant_bits", [])
 
-        if (args.bits == 8 and "int8" in quant_bits) or (
-            args.bits == 16 and "int16" in quant_bits
-        ):
-            export_path = os.path.join(args.output_path, op_type)
-            for cfg in op_configs:
+            if (args.bits == 8 and "int8" in quant_bits) or (
+                args.bits == 16 and "int16" in quant_bits
+            ):
+                export_path = os.path.join(args.output_path, op_type)
+                for cfg in op_configs:
+                    print(
+                        "Op Test Function: ",
+                        op_test_func,
+                        "Configs: ",
+                        cfg,
+                        "Package: ",
+                        pkg.__name__,
+                        "Output Path: ",
+                        export_path,
+                    )
+                    op = getattr(pkg, op_test_func)(cfg)
+                    BaseInferencer(
+                        op,
+                        export_path=export_path,
+                        model_cfg=cfg,
+                        target=args.target,
+                        num_of_bits=args.bits,
+                        model_version=args.version,
+                        meta_cfg=config["meta"],
+                    )()
+            else:
                 print(
-                    "Op Test Function: ",
-                    op_test_func,
-                    "Configs: ",
-                    cfg,
-                    "Package: ",
-                    pkg.__name__,
-                    "Output Path: ",
-                    export_path,
+                    f"Skip op: {op_type}, do not support quantization with {args.bits} bits."
                 )
-                op = getattr(pkg, op_test_func)(cfg)
-                BaseInferencer(
-                    op,
-                    export_path=export_path,
-                    model_cfg=cfg,
-                    target=args.target,
-                    num_of_bits=args.bits,
-                    model_version=args.version,
-                    meta_cfg=config["meta"],
-                )()
+    else:
+        model_config = config["models_test"][args.models]
+        if args.bits == 8 or args.bits == 16:
+            model = onnx.load(model_config["onnx_model_path"])
+            BaseInferencer(
+                model,
+                export_path=args.output_path,
+                model_cfg=model_config,
+                target=args.target,
+                num_of_bits=args.bits,
+                model_version=args.version,
+                meta_cfg=config["meta"],
+            )()
         else:
-            print(
-                f"Skip op: {op_type}, do not support quantization with {args.bits} bits."
-            )
+            print(f"Do not support quantization with {args.bits} bits.")