Resolve merge conflict in utils.py

apache · Jun 20, 2022 · 5b9bd4b · 5b9bd4b
1 parent 9019c1c
commit 5b9bd4b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/python/tvm/topi/hexagon/utils.py b/python/tvm/topi/hexagon/utils.py
@@ -23,17 +23,17 @@
 
 
 def n11c_1024c_2d(n, h, w, c):
-    """Return index map for n11c_1024c_2d layout"""
+    """Return index map for n11c_1024 2d layout"""
     return [n, h, w, c // 1024, te.AXIS_SEPARATOR, c % 1024]
 
 
 def n11c_1024c_1d(n, h, w, c):
-    """Return index map for n11c_1024c_1d layout"""
+    """Return index map for n11c_1024 1d layout"""
     return [n, h, w, c // 1024, c % 1024]
 
 
 def nhwc_8h2w32c2w_2d(n, h, w, c):
-    """Return index map for nhwc_8h2w32c2w_2d layout"""
+    """Return index map for nhwc_8h2w32c2w 2d layout"""
     return [n, h // 8, w // 4, c // 32, te.AXIS_SEPARATOR, h % 8, (w % 4) // 2, c % 32, w % 2]
 
 
@@ -43,22 +43,22 @@ def nhwc_8h2w32c2w_1d(n, h, w, c):
 
 
 def nhwc_4h4w32c_1d(n, h, w, c):
-    """Return index map for nhwc_4h4232c_1d layout"""
+    """Return index map for nhwc_4h4232c 1d layout"""
     return [n, h // 4, w // 4, c // 32, h % 4, w % 4, c % 32]
 
 
 def nhwc_4h4w32c_2d(n, h, w, c):
-    """Return index map for nhwc_4h4w32c_2d layout"""
+    """Return index map for nhwc_4h4w32c 2d layout"""
     return [n, h // 4, w // 4, c // 32, te.AXIS_SEPARATOR, h % 4, w % 4, c % 32]
 
 
 def nc_512c_1d(n, c):
-    """Return index map for nc_512c_1d layout"""
+    """Return index map for nc_512c 1d layout"""
     return [n, c // 512, c % 512]
 
 
 def nc_512c_2d(n, c):
-    """Return index map for nc_512c_2d layout"""
+    """Return index map for nc_512c 2d layout"""
     return [n, c // 512, te.AXIS_SEPARATOR, c % 512]