WIP

Author: whoisj

qa/common/gen_qa_models.py

@@ -47,6 +47,8 @@
 np_dtype_string = np.dtype(object)
 from typing import List, Tuple
 
+
+_color_blue = "\033[94m"
 _color_green = "\033[32m"
 _color_magenta = "\033[35m"
 _color_red = "\033[31m"
@@ -1655,7 +1657,7 @@ def create_libtorch_pt2_modelconfig(
     dims: [ {tu.shape_to_dims_str(output1_shape)} ]
   }}
 ]
-instance_group [{{ kind: "{"KIND_GPU" if torch.cuda.is_available() else "KIND_CPU"}" }}]
+instance_group [{{ kind: {"KIND_GPU" if torch.cuda.is_available() else "KIND_CPU"} }}]
 """
 
     try:
@@ -1987,6 +1989,7 @@ def create_models(
     output0_label_cnt,
     version_policy=None,
 ):
+    print(f"{_color_blue}Creating models in {models_dir}{_color_reset}")
     model_version = 1
     if FLAGS.tensorrt:
         print(f"{_color_magenta}TensorRT model generation requested{_color_reset}")
@@ -2266,18 +2269,6 @@ def create_models(
             output1_dtype,
         )
 
-    if FLAGS.torchvision_aoti:
-        print(f"{_color_magenta}TorchVision AOTI model generation requested{_color_reset}")
-        if create_torchvision_aoti_modelfile(
-                models_dir,
-                1,
-                model_version,
-            ):
-            create_torchvision_aoti_modelconfig(
-                models_dir,
-                1,
-            )
-
     if FLAGS.openvino:
         print(f"{_color_magenta}OpenVINO model generation requested{_color_reset}")
         # max-batch 8
@@ -2692,24 +2683,6 @@ def create_fixed_models(
                     FLAGS.models_dir, 0, 3, (16,), (16,), (16,), vt, vt, vt, swap=True
                 )
 
-        if FLAGS.torch_aoti:
-            for vt in [np.float32, np.int32, np.int16, np.int8]:
-                create_torch_aoti_modelfile(
-                    FLAGS.models_dir, 8, 2, (16,), (16,), (16,), vt, vt, vt, swap=True
-                )
-                create_torch_aoti_modelfile(
-                    FLAGS.models_dir, 8, 3, (16,), (16,), (16,), vt, vt, vt, swap=True
-                )
-                create_torch_aoti_modelfile(
-                    FLAGS.models_dir, 0, 2, (16,), (16,), (16,), vt, vt, vt, swap=True
-                )
-                create_torch_aoti_modelfile(
-                    FLAGS.models_dir, 0, 3, (16,), (16,), (16,), vt, vt, vt, swap=True
-                )
-
-        if FLAGS.torchvision_aoti:
-            create_torchvision_aoti_modelfile(FLAGS.models_dir, 1, 1)
-
         if FLAGS.openvino:
             for vt in [np.float16, np.float32, np.int8, np.int16, np.int32]:
                 create_openvino_modelfile(
@@ -2925,3 +2898,15 @@ def create_fixed_models(
             # to fixed size model is not safe but doable
             for model_shape in [(-1,), (-1, -1), (-1, -1, -1)]:
                 emu.create_nop_modelconfig(FLAGS.models_dir, model_shape, model_dtype)
+
+    if FLAGS.torchvision_aoti:
+        print(f"{_color_blue}TorchVision AOTI model generation requested{_color_reset}")
+        if create_torchvision_aoti_modelfile(
+                FLAGS.models_dir,
+                1,
+                1,
+            ):
+            create_torchvision_aoti_modelconfig(
+                FLAGS.models_dir,
+                1,
+            )