From 9a5f904f5cb235b10f13f37cab9fbbd6dd9c5ae9 Mon Sep 17 00:00:00 2001 From: Fabbio Protopapa Date: Tue, 8 Dec 2020 16:04:08 +0100 Subject: [PATCH 1/7] Update deploy_classification.py Changed import paths --- vta/tutorials/frontend/deploy_classification.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vta/tutorials/frontend/deploy_classification.py b/vta/tutorials/frontend/deploy_classification.py index 1bf4161a3340..680331acd119 100644 --- a/vta/tutorials/frontend/deploy_classification.py +++ b/vta/tutorials/frontend/deploy_classification.py @@ -57,8 +57,9 @@ from tvm.relay import transform import vta -from vta.testing import simulator -from vta.top import graph_pack +from vta.python.vta.testing import simulator +from vta.python.vta.top import graphpack as graph_pack +from vta.python import vta # Make sure that TVM was compiled with RPC=1 assert tvm.runtime.enabled("rpc") @@ -178,7 +179,7 @@ mod = relay.quantize.quantize(mod, params=params) # Perform graph packing and constant folding for VTA target assert env.BLOCK_IN == env.BLOCK_OUT - relay_prog = graph_pack( + relay_prog = graph_pack.graph_pack( mod["main"], env.BATCH, env.BLOCK_OUT, From f85a70714fbd0ead99037a357cb66de9dc5286c6 Mon Sep 17 00:00:00 2001 From: Fabbio Protopapa Date: Tue, 8 Dec 2020 16:07:02 +0100 Subject: [PATCH 2/7] Update deploy_detection.py changed import paths and stop layer id --- vta/tutorials/frontend/legacy/deploy_detection.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vta/tutorials/frontend/legacy/deploy_detection.py b/vta/tutorials/frontend/legacy/deploy_detection.py index 7a4aba93146b..9f0674a98059 100644 --- a/vta/tutorials/frontend/legacy/deploy_detection.py +++ b/vta/tutorials/frontend/legacy/deploy_detection.py @@ -58,10 +58,11 @@ from tvm import rpc, autotvm, relay from tvm.relay.testing import yolo_detection, darknet from tvm.relay.testing.darknet import __darknetffi__ -from tvm.contrib import graph_runtime, graph_runtime, util +from tvm.contrib import graph_runtime, graph_runtime, utils from tvm.contrib.download import download_testdata -from vta.testing import simulator -from vta.top import graph_pack +from vta.python.vta.testing import simulator +from vta.python.vta.top import graphpack as graph_pack +from vta.python import vta # Make sure that TVM was compiled with RPC=1 assert tvm.runtime.enabled("rpc") @@ -123,7 +124,7 @@ target = env.target if device == "vta" else env.target_vta_cpu pack_dict = { - "yolov3-tiny": ["nn.max_pool2d", "cast", 4, 185], + "yolov3-tiny": ["nn.max_pool2d", "cast", 4, 186], } # Name of Darknet model to compile @@ -219,7 +220,7 @@ ): mod = relay.quantize.quantize(mod, params=params) # Perform graph packing and constant folding for VTA target - mod = graph_pack( + mod = graph_pack.graph_pack( mod["main"], env.BATCH, env.BLOCK_OUT, From cc2ee40c9f4ae6122312bc5846bc905a9b160ea6 Mon Sep 17 00:00:00 2001 From: Fabbio Protopapa Date: Wed, 9 Dec 2020 08:35:17 +0100 Subject: [PATCH 3/7] Update deploy_classification.py Set working directory to TVM base. --- vta/tutorials/frontend/deploy_classification.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vta/tutorials/frontend/deploy_classification.py b/vta/tutorials/frontend/deploy_classification.py index 680331acd119..0b04ee68a525 100644 --- a/vta/tutorials/frontend/deploy_classification.py +++ b/vta/tutorials/frontend/deploy_classification.py @@ -42,7 +42,7 @@ import argparse, json, os, requests, sys, time from io import BytesIO -from os.path import join, isfile +from os.path import join, isfile, dirname, pardir from PIL import Image from mxnet.gluon.model_zoo import vision @@ -56,6 +56,10 @@ from tvm.contrib.debugger import debug_runtime from tvm.relay import transform +os.chdir(dirname(os.path.abspath(__file__))) +os.chdir(join(pardir, pardir, pardir)) +sys.path.append(os.getcwd()) + import vta from vta.python.vta.testing import simulator from vta.python.vta.top import graphpack as graph_pack From d2651d07a049c44d5f602357ccfd08e69ed63ecc Mon Sep 17 00:00:00 2001 From: Fabbio Protopapa Date: Wed, 9 Dec 2020 08:42:35 +0100 Subject: [PATCH 4/7] Update deploy_detection.py Set working directory to TVM base. Changed layer id in comment to 186. --- vta/tutorials/frontend/legacy/deploy_detection.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vta/tutorials/frontend/legacy/deploy_detection.py b/vta/tutorials/frontend/legacy/deploy_detection.py index 9f0674a98059..e36a7f4aa2ac 100644 --- a/vta/tutorials/frontend/legacy/deploy_detection.py +++ b/vta/tutorials/frontend/legacy/deploy_detection.py @@ -53,6 +53,12 @@ import time import matplotlib.pyplot as plt import numpy as np +from os.path import join, dirname, pardir + +os.chdir(dirname(os.path.abspath(__file__))) +os.chdir(join(pardir, pardir, pardir, pardir)) +sys.path.append(os.getcwd()) + import tvm import vta from tvm import rpc, autotvm, relay @@ -132,7 +138,7 @@ # to start and end the graph packing relay pass: in other words # where to start and finish offloading to VTA. # the number 4 indicate the the ``start_pack`` index is 4, the -# number 185 indicate the ``stop_pack index`` is 185, by using +# number 186 indicate the ``stop_pack index`` is 186, by using # name and index number, here we can located to correct place # where to start/end when there are multiple ``nn.max_pool2d`` # or ``cast``, print(mod.astext(show_meta_data=False)) can help From cb655694102a26342b6237cece9f80f6857a4a66 Mon Sep 17 00:00:00 2001 From: Fabbio Protopapa Date: Wed, 9 Dec 2020 14:06:11 +0100 Subject: [PATCH 5/7] reverse changes in deploy_classification.py Reversed changes in import path. Imports working as expected. --- vta/tutorials/frontend/deploy_classification.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/vta/tutorials/frontend/deploy_classification.py b/vta/tutorials/frontend/deploy_classification.py index 0b04ee68a525..1bf4161a3340 100644 --- a/vta/tutorials/frontend/deploy_classification.py +++ b/vta/tutorials/frontend/deploy_classification.py @@ -42,7 +42,7 @@ import argparse, json, os, requests, sys, time from io import BytesIO -from os.path import join, isfile, dirname, pardir +from os.path import join, isfile from PIL import Image from mxnet.gluon.model_zoo import vision @@ -56,14 +56,9 @@ from tvm.contrib.debugger import debug_runtime from tvm.relay import transform -os.chdir(dirname(os.path.abspath(__file__))) -os.chdir(join(pardir, pardir, pardir)) -sys.path.append(os.getcwd()) - import vta -from vta.python.vta.testing import simulator -from vta.python.vta.top import graphpack as graph_pack -from vta.python import vta +from vta.testing import simulator +from vta.top import graph_pack # Make sure that TVM was compiled with RPC=1 assert tvm.runtime.enabled("rpc") @@ -183,7 +178,7 @@ mod = relay.quantize.quantize(mod, params=params) # Perform graph packing and constant folding for VTA target assert env.BLOCK_IN == env.BLOCK_OUT - relay_prog = graph_pack.graph_pack( + relay_prog = graph_pack( mod["main"], env.BATCH, env.BLOCK_OUT, From ab642529d7e8715df0fbd26a08b5106d6811e1ee Mon Sep 17 00:00:00 2001 From: Fabbio Protopapa Date: Wed, 9 Dec 2020 14:11:14 +0100 Subject: [PATCH 6/7] Reverse change in import paths Imports working as expected. --- vta/tutorials/frontend/legacy/deploy_detection.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/vta/tutorials/frontend/legacy/deploy_detection.py b/vta/tutorials/frontend/legacy/deploy_detection.py index e36a7f4aa2ac..b47307a8ed12 100644 --- a/vta/tutorials/frontend/legacy/deploy_detection.py +++ b/vta/tutorials/frontend/legacy/deploy_detection.py @@ -53,12 +53,6 @@ import time import matplotlib.pyplot as plt import numpy as np -from os.path import join, dirname, pardir - -os.chdir(dirname(os.path.abspath(__file__))) -os.chdir(join(pardir, pardir, pardir, pardir)) -sys.path.append(os.getcwd()) - import tvm import vta from tvm import rpc, autotvm, relay @@ -66,9 +60,8 @@ from tvm.relay.testing.darknet import __darknetffi__ from tvm.contrib import graph_runtime, graph_runtime, utils from tvm.contrib.download import download_testdata -from vta.python.vta.testing import simulator -from vta.python.vta.top import graphpack as graph_pack -from vta.python import vta +from vta.testing import simulator +from vta.top import graph_pack # Make sure that TVM was compiled with RPC=1 assert tvm.runtime.enabled("rpc") @@ -226,7 +219,7 @@ ): mod = relay.quantize.quantize(mod, params=params) # Perform graph packing and constant folding for VTA target - mod = graph_pack.graph_pack( + mod = graph_pack( mod["main"], env.BATCH, env.BLOCK_OUT, From 931ee1c70640363855244c0a90086fc81cb676e6 Mon Sep 17 00:00:00 2001 From: Fabbio Protopapa Date: Thu, 10 Dec 2020 11:51:00 +0100 Subject: [PATCH 7/7] Update deploy_detection.py Duplicated graph_runtime import removed. --- vta/tutorials/frontend/legacy/deploy_detection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vta/tutorials/frontend/legacy/deploy_detection.py b/vta/tutorials/frontend/legacy/deploy_detection.py index b47307a8ed12..cbb320e98f13 100644 --- a/vta/tutorials/frontend/legacy/deploy_detection.py +++ b/vta/tutorials/frontend/legacy/deploy_detection.py @@ -58,7 +58,7 @@ from tvm import rpc, autotvm, relay from tvm.relay.testing import yolo_detection, darknet from tvm.relay.testing.darknet import __darknetffi__ -from tvm.contrib import graph_runtime, graph_runtime, utils +from tvm.contrib import graph_runtime, utils from tvm.contrib.download import download_testdata from vta.testing import simulator from vta.top import graph_pack