Arm backend: Update vgf ops tests [Part 1] (#16245)

Updates the the first half of vgf op tests to use the quantize flag to
VgfTestPipeline instead of passing a tosa_version.

Signed-off-by: Oscar Andersson <oscar.andersson@arm.com>

Author: oscarandersson8218

backends/arm/test/ops/test_abs.py

@@ -77,21 +77,25 @@ def test_abs_u85_INT(test_data: torch.Tensor):
 
 @common.parametrize("test_data", Abs.test_parameters)
 @common.SkipIfNoModelConverter
-def test_abs_vgf_FP(test_data: input_t1):
+def test_abs_vgf_no_quant(test_data: input_t1):
     pipeline = VgfPipeline[input_t1](
-        Abs(), test_data(), aten_op, exir_op, tosa_version="TOSA-1.0+FP"
+        Abs(),
+        test_data(),
+        aten_op,
+        exir_op,
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Abs.test_parameters)
 @common.SkipIfNoModelConverter
-def test_abs_vgf_INT(test_data: input_t1):
+def test_abs_vgf_quant(test_data: input_t1):
     pipeline = VgfPipeline[input_t1](
         Abs(),
         test_data(),
         aten_op,
         exir_op,
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()

backends/arm/test/ops/test_acos.py

@@ -95,27 +95,27 @@ def test_acos_u85_INT(test_data: Tuple):
 
 @common.parametrize("test_data", test_data_suite)
 @common.SkipIfNoModelConverter
-def test_acos_vgf_FP(test_data: Tuple):
+def test_acos_vgf_no_quant(test_data: Tuple):
     pipeline = VgfPipeline[input_t](
         Acos(),
         (test_data(),),
         [],
         [],
-        tosa_version="TOSA-1.0+FP",
         run_on_vulkan_runtime=True,
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", test_data_suite)
 @common.SkipIfNoModelConverter
-def test_acos_vgf_INT(test_data: Tuple):
+def test_acos_vgf_quant(test_data: Tuple):
     pipeline = VgfPipeline[input_t](
         Acos(),
         (test_data(),),
         [],
         [],
-        tosa_version="TOSA-1.0+INT",
         run_on_vulkan_runtime=True,
+        quantize=True,
     )
     pipeline.run()

backends/arm/test/ops/test_acosh.py

@@ -115,23 +115,23 @@ def test_acosh_u85_INT_xfail(test_data: Tuple):
 
 @common.parametrize("test_data", test_data_suite)
 @common.SkipIfNoModelConverter
-def test_acosh_vgf_FP(test_data: Tuple):
+def test_acosh_vgf_no_quant(test_data: Tuple):
     pipeline = VgfPipeline[input_t](
         Acosh(),
         (test_data(),),
         aten_op,
-        tosa_version="TOSA-1.0+FP",
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", test_data_suite)
 @common.SkipIfNoModelConverter
-def test_acosh_vgf_INT(test_data: Tuple):
+def test_acosh_vgf_quant(test_data: Tuple):
     pipeline = VgfPipeline[input_t](
         Acosh(),
         (test_data(),),
         aten_op,
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()

backends/arm/test/ops/test_adaptive_avg_pool2d.py

@@ -216,27 +216,27 @@ def test_adaptive_avg_pool2d_16a8w_u85_INT16(test_module):
 
 @common.parametrize("test_module", test_modules)
 @common.SkipIfNoModelConverter
-def test_adaptive_avg_pool2d_vgf_FP(test_module):
+def test_adaptive_avg_pool2d_vgf_no_quant(test_module):
     model, input_tensor = test_module()
     pipeline = VgfPipeline[input_t](
         model,
         input_tensor,
         [],
         exir_op,
-        tosa_version="TOSA-1.0+FP",
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_module", test_modules)
 @common.SkipIfNoModelConverter
-def test_adaptive_avg_pool2d_vgf_INT(test_module):
+def test_adaptive_avg_pool2d_vgf_quant(test_module):
     model, input_tensor = test_module()
     pipeline = VgfPipeline[input_t](
         model,
         input_tensor,
         [],
         exir_op,
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()

backends/arm/test/ops/test_add.py

@@ -202,28 +202,28 @@ def test_add_tensor_u85_INT_2(test_data: input_t2):
 
 @common.parametrize("test_data", Add.test_data)
 @common.SkipIfNoModelConverter
-def test_add_tensor_vgf_FP(test_data: input_t1):
+def test_add_tensor_vgf_no_quant(test_data: input_t1):
     pipeline = VgfPipeline[input_t1](
         Add(),
         test_data(),
         aten_op,
         exir_op,
-        tosa_version="TOSA-1.0+FP",
         run_on_vulkan_runtime=True,
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Add.test_data)
 @common.SkipIfNoModelConverter
-def test_add_tensor_vgf_INT(test_data: input_t1):
+def test_add_tensor_vgf_quant(test_data: input_t1):
     pipeline = VgfPipeline[input_t1](
         Add(),
         test_data(),
         aten_op,
         exir_op,
-        tosa_version="TOSA-1.0+INT",
         run_on_vulkan_runtime=True,
+        quantize=True,
     )
     pipeline.run()
 

backends/arm/test/ops/test_addmm.py

@@ -167,26 +167,26 @@ def test_addmm_u85_INT(test_data: Tuple):
 
 @common.parametrize("test_data", test_data_suite)
 @common.SkipIfNoModelConverter
-def test_addmm_vgf_FP(test_data: input_t1):
+def test_addmm_vgf_no_quant(test_data: input_t1):
     pipeline = VgfPipeline[input_t1](
         Addmm(),
         (*test_data,),
         aten_op=aten_op,
         exir_op=exir_op,
-        tosa_version="TOSA-1.0+FP",
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", test_data_suite)
 @common.SkipIfNoModelConverter
-def test_addmm_vgf_INT(test_data: input_t1):
+def test_addmm_vgf_quant(test_data: input_t1):
     pipeline = VgfPipeline[input_t1](
         Addmm(),
         (*test_data,),
         aten_op=[],
         exir_op=exir_op,
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()
 

backends/arm/test/ops/test_alias_copy.py

@@ -90,25 +90,25 @@ def test_alias_u85_INT(test_data: input_t1):
 
 @common.parametrize("test_data", AliasCopy.test_data)
 @common.SkipIfNoModelConverter
-def test_alias_vgf_FP(test_data: input_t1):
+def test_alias_vgf_no_quant(test_data: input_t1):
     pipeline = VgfPipeline[input_t1](
         AliasCopy(),
         test_data(),
         AliasCopy.aten_op,
         AliasCopy.exir_op,
-        tosa_version="TOSA-1.0+FP",
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", AliasCopy.test_data)
 @common.SkipIfNoModelConverter
-def test_alias_vgf_INT(test_data: input_t1):
+def test_alias_vgf_quant(test_data: input_t1):
     pipeline = VgfPipeline[input_t1](
         AliasCopy(),
         test_data(),
         AliasCopy.aten_op,
         AliasCopy.exir_op,
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()

backends/arm/test/ops/test_amax.py

@@ -139,53 +139,53 @@ def test_max_dim_tosa_FP_not_delegated():
 
 @common.parametrize("test_data", Amax.test_data)
 @common.SkipIfNoModelConverter
-def test_amax_vgf_FP(test_data: Amax.input_t):
+def test_amax_vgf_no_quant(test_data: Amax.input_t):
     data, dim, keep_dims = test_data()
     module = Amax(dim, keep_dims)
     pipeline = VgfPipeline[Amax.input_t](
         module,
         data,
         Amax.aten_op,
-        tosa_version="TOSA-1.0+FP",
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Amax.test_data)
 @common.SkipIfNoModelConverter
-def test_amax_vgf_INT(test_data: Amax.input_t):
+def test_amax_vgf_quant(test_data: Amax.input_t):
     data, dim, keep_dims = test_data()
     module = Amax(dim, keep_dims)
     pipeline = VgfPipeline[Amax.input_t](
         module,
         data,
         Amax.aten_op,
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Max.test_data)
 @common.SkipIfNoModelConverter
-def test_max_dim_vgf_FP_to_amax(test_data: Max.input_t):
+def test_max_dim_to_amax_vgf_no_quant(test_data: Max.input_t):
     data, dim = test_data()
     pipeline = VgfPipeline[Max.input_t](
         Max(dim),
         data,
         "torch.ops.aten.max",
-        tosa_version="TOSA-1.0+FP",
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Max.test_data)
 @common.SkipIfNoModelConverter
-def test_max_dim_vgf_INT_to_amax(test_data: Max.input_t):
+def test_max_dim_to_amax_vgf_quant(test_data: Max.input_t):
     data, dim = test_data()
     pipeline = VgfPipeline[Max.input_t](
         Max(dim),
         data,
         "torch.ops.aten.amax",
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()

backends/arm/test/ops/test_amin.py

@@ -155,48 +155,51 @@ def test_min_dim_tosa_FP_not_delegated():
 
 @common.parametrize("test_data", Amin.test_data)
 @common.SkipIfNoModelConverter
-def test_amin_vgf_FP(test_data: Amin.input_t):
+def test_amin_vgf_no_quant(test_data: Amin.input_t):
     data, dim, keep_dims = test_data()
     pipeline = VgfPipeline[Amin.input_t](
-        Amin(dim, keep_dims), data, Amin.aten_op, tosa_version="TOSA-1.0+FP"
+        Amin(dim, keep_dims),
+        data,
+        Amin.aten_op,
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Amin.test_data)
 @common.SkipIfNoModelConverter
-def test_amin_vgf_INT(test_data: Amin.input_t):
+def test_amin_vgf_quant(test_data: Amin.input_t):
     data, dim, keep_dims = test_data()
     pipeline = VgfPipeline[Amin.input_t](
         Amin(dim, keep_dims),
         data,
         Amin.aten_op,
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Min.test_data)
 @common.SkipIfNoModelConverter
-def test_min_dim_vgf_FP_to_amin(test_data: Min.input_t):
+def test_min_dim_to_amin_vgf_no_quant(test_data: Min.input_t):
     data, dim = test_data()
     pipeline = VgfPipeline[Min.input_t](
         Min(dim),
         data,
         "torch.ops.aten.min",
-        tosa_version="TOSA-1.0+FP",
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Min.test_data)
 @common.SkipIfNoModelConverter
-def test_min_dim_vgf_INT_to_amin(test_data: Min.input_t):
+def test_min_dim_to_amin_vgf_quant(test_data: Min.input_t):
     data, dim = test_data()
     pipeline = VgfPipeline[Min.input_t](
         Min(dim),
         data,
         "torch.ops.aten.amin",
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()

backends/arm/test/ops/test_any.py

@@ -184,27 +184,27 @@ def test_any_u85_INT(test_data: input_t1):
 
 @common.parametrize("test_data", test_data)
 @common.SkipIfNoModelConverter
-def test_any_vgf_FP(test_data: input_t1):
+def test_any_vgf_no_quant(test_data: input_t1):
     op, data_fn = test_data()
     pipeline = VgfPipeline[input_t1](
         op,
         data_fn(),
         op.aten_op,
         op.exir_op,
-        tosa_version="TOSA-1.0+FP",
+        quantize=False,
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", test_data)
 @common.SkipIfNoModelConverter
-def test_any_vgf_INT(test_data: input_t1):
+def test_any_vgf_quant(test_data: input_t1):
     op, data_fn = test_data()
     pipeline = VgfPipeline[input_t1](
         op,
         data_fn(),
         op.aten_op,
         op.exir_op,
-        tosa_version="TOSA-1.0+INT",
+        quantize=True,
     )
     pipeline.run()