merge fix

vta/python/vta/top/vta_conv2d.py

@@ -193,60 +193,3 @@ def _traverse(op):
     s[conv2d_stage].tensorize(x_bi, env.gemm)
     s[output].pragma(x_co1, env.dma_copy)
     return s
-<<<<<<< HEAD
-
-class Conv2DSchedule(object):
-    """ 2D convolution schedule object.
-    """
-    def __init__(self,
-                 b_factor=1,
-                 oc_factor=1,
-                 ic_factor=1,
-                 h_factor=1,
-                 w_factor=0,
-                 oc_nthread=0,
-                 h_nthread=0,
-                 debug_sync=False):
-        self.b_factor = b_factor
-        self.oc_factor = oc_factor
-        self.ic_factor = ic_factor
-        self.h_factor = h_factor
-        self.w_factor = w_factor
-        self.oc_nthread = oc_nthread
-        self.h_nthread = h_nthread
-        self.debug_sync = debug_sync
-
-    def __str__(self):
-        return "{}.{}.{}.{}.{}.{}.{}".format(
-            self.b_factor, self.oc_factor, self.ic_factor,
-            self.h_factor, self.w_factor,
-            self.oc_nthread, self.h_nthread)
-
-Schedule = Conv2DSchedule
-
-# Layer description of the ResNet18
-RESNET = {
-    0: Workload(1, 224, 224, 16, 64, 7, 7, 3, 3, 2, 2),
-    1: Workload(1, 56, 56, 64, 64, 3, 3, 1, 1, 1, 1),
-    2: Workload(1, 56, 56, 64, 64, 1, 1, 0, 0, 1, 1),
-    3: Workload(1, 56, 56, 64, 128, 3, 3, 1, 1, 2, 2),
-    4: Workload(1, 56, 56, 64, 128, 1, 1, 0, 0, 2, 2),
-    5: Workload(1, 28, 28, 128, 128, 3, 3, 1, 1, 1, 1),
-    6: Workload(1, 28, 28, 128, 256, 3, 3, 1, 1, 2, 2),
-    7: Workload(1, 28, 28, 128, 256, 1, 1, 0, 0, 2, 2),
-    8: Workload(1, 14, 14, 256, 256, 3, 3, 1, 1, 1, 1),
-    9: Workload(1, 14, 14, 256, 512, 3, 3, 1, 1, 2, 2),
-    10: Workload(1, 14, 14, 256, 512, 1, 1, 0, 0, 2, 2),
-    11: Workload(1, 7, 7, 512, 512, 3, 3, 1, 1, 1, 1),
-}
-
-for idx in RESNET:
-    f_schedules = find_schedules(RESNET[idx], vt_only=True, best_only=True)
-    if f_schedules:
-        scheds = f_schedules[0]
-        _WL2PLAN[RESNET[idx]] = scheds
-    else:
-        logging.warning("No valid schedule was found for the workload on current vta configuration")
-        break
-=======
->>>>>>> autotvm support for conv2d operator