Skip to content

Commit

Permalink
Fixing rebase merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Wheest committed Mar 19, 2021
2 parents b9aa0ec + 03f4458 commit 0c23610
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions python/tvm/topi/x86/group_conv2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ def traverse(op):
s[kernel].compute_inline()
data_vec = conv_out.op.input_tensors[0]
data = data_vec.op.input_tensors[0]
data_pad = None
if isinstance(data.op, tvm.te.ComputeOp) and "pad" in data.op.tag:
data_pad = data
data = data_pad.op.input_tensors[0]
Expand Down

0 comments on commit 0c23610

Please sign in to comment.