Skip to content

Commit

Permalink
[FIX] Merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
f-dangel committed Dec 19, 2022
1 parent a4c2ec9 commit 48e9fbe
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions backpack/utils/conv.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Utility functions for convolution layers."""

from typing import Callable, Tuple, Type, Union
from warnings import warn

import torch
from einops import rearrange
Expand Down Expand Up @@ -180,8 +181,6 @@ def unfold_by_conv(
stride=module.stride,
)

return unfold.reshape(N, C_in * kernel_size_numel, -1)


def _grad_input_padding(
grad_output, input_size, stride, padding, kernel_size, dilation=None
Expand Down

0 comments on commit 48e9fbe

Please sign in to comment.