@@ -4574,15 +4574,14 @@ def test_gMLP(self):
45744574 else :
45754575 self .assertGreaterEqual (msg ["top_1" ], 60 )
45764576 self .assertGreaterEqual (msg ["top_5" ], 85 )
4577-
4578- @unittest .skip ("Only outputs good accuracy in QNN 2.29" )
4579- def test_mobilevit_v2 (self ):
4577+
4578+ def test_mobilevit_v1 (self ):
45804579 if not self .required_envs ([self .image_dataset ]):
45814580 self .skipTest ("missing required envs" )
45824581
45834582 cmds = [
45844583 "python" ,
4585- f"{ self .executorch_root } /examples/qualcomm/oss_scripts/mobilevit_v2 .py" ,
4584+ f"{ self .executorch_root } /examples/qualcomm/oss_scripts/mobilevit_v1 .py"
45864585 "--dataset" ,
45874586 self .image_dataset ,
45884587 "--artifact" ,
@@ -4600,8 +4599,6 @@ def test_mobilevit_v2(self):
46004599 ]
46014600 if self .host :
46024601 cmds .extend (["--host" , self .host ])
4603- if self .shared_buffer :
4604- cmds .extend (["--shared_buffer" ])
46054602
46064603 p = subprocess .Popen (cmds , stdout = subprocess .DEVNULL )
46074604 with Listener ((self .ip , self .port )) as listener :
@@ -4611,17 +4608,23 @@ def test_mobilevit_v2(self):
46114608 if "Error" in msg :
46124609 self .fail (msg ["Error" ])
46134610 else :
4614- self .assertGreaterEqual (msg ["top_1" ], 50 )
4611+ self .assertGreaterEqual (msg ["top_1" ], 70 )
46154612 self .assertGreaterEqual (msg ["top_5" ], 85 )
46164613
4617- def test_pvt (self ):
4614+
4615+ @unittest .skip ("Only outputs good accuracy in QNN 2.29" )
4616+ def test_mobilevit_v2 (self ):
46184617 if not self .required_envs ([self .image_dataset ]):
46194618 self .skipTest ("missing required envs" )
46204619
46214620 cmds = [
46224621 "python" ,
4623- f"{ self .executorch_root } /examples/qualcomm/oss_scripts/pvt.py" ,
4622+ f"{ self .executorch_root } /examples/qualcomm/oss_scripts/mobilevit_v2.py" ,
4623+ "--dataset" ,
46244624 self .image_dataset ,
4625+ "--artifact" ,
4626+ self .artifact_dir ,
4627+ "--build_folder" ,
46254628 self .build_folder ,
46264629 "--device" ,
46274630 self .device ,
@@ -4634,6 +4637,8 @@ def test_pvt(self):
46344637 ]
46354638 if self .host :
46364639 cmds .extend (["--host" , self .host ])
4640+ if self .shared_buffer :
4641+ cmds .extend (["--shared_buffer" ])
46374642
46384643 p = subprocess .Popen (cmds , stdout = subprocess .DEVNULL )
46394644 with Listener ((self .ip , self .port )) as listener :
@@ -4643,21 +4648,17 @@ def test_pvt(self):
46434648 if "Error" in msg :
46444649 self .fail (msg ["Error" ])
46454650 else :
4646- self .assertGreaterEqual (msg ["top_1" ], 65 )
4651+ self .assertGreaterEqual (msg ["top_1" ], 50 )
46474652 self .assertGreaterEqual (msg ["top_5" ], 85 )
46484653
4649- def test_mobilevit_v1 (self ):
4654+ def test_pvt (self ):
46504655 if not self .required_envs ([self .image_dataset ]):
46514656 self .skipTest ("missing required envs" )
46524657
46534658 cmds = [
46544659 "python" ,
4655- f"{ self .executorch_root } /examples/qualcomm/oss_scripts/mobilevit_v1.py"
4656- "--dataset" ,
4660+ f"{ self .executorch_root } /examples/qualcomm/oss_scripts/pvt.py" ,
46574661 self .image_dataset ,
4658- "--artifact" ,
4659- self .artifact_dir ,
4660- "--build_folder" ,
46614662 self .build_folder ,
46624663 "--device" ,
46634664 self .device ,
@@ -4679,7 +4680,7 @@ def test_mobilevit_v1(self):
46794680 if "Error" in msg :
46804681 self .fail (msg ["Error" ])
46814682 else :
4682- self .assertGreaterEqual (msg ["top_1" ], 70 )
4683+ self .assertGreaterEqual (msg ["top_1" ], 65 )
46834684 self .assertGreaterEqual (msg ["top_5" ], 85 )
46844685
46854686 def test_regnet (self ):
0 commit comments