Skip to content

GitLab

Commit be8c6719 authored by Andrea Paris's avatar Andrea Paris Committed by Boris Bonev
Browse files

cleanup of merge conflict resolution

parent 82e7860d
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
torch_harmonics/convolution.py
View file @ be8c6719
...@@ -663,8 +663,6 @@ class DiscreteContinuousConvTransposeS2(DiscreteContinuousConv): ...@@ -663,8 +663,6 @@ class DiscreteContinuousConvTransposeS2(DiscreteContinuousConv):
def psi_idx(self): def psi_idx(self):
return torch.stack([self.psi_ker_idx, self.psi_row_idx, self.psi_col_idx], dim=0).contiguous() return torch.stack([self.psi_ker_idx, self.psi_row_idx, self.psi_col_idx], dim=0).contiguous()
<<<<<<< HEAD
=======
def get_psi(self, semi_transposed: bool = False): def get_psi(self, semi_transposed: bool = False):
""" """
Get the convolution tensor Get the convolution tensor
...@@ -694,7 +692,6 @@ class DiscreteContinuousConvTransposeS2(DiscreteContinuousConv): ...@@ -694,7 +692,6 @@ class DiscreteContinuousConvTransposeS2(DiscreteContinuousConv):
return psi return psi
>>>>>>> 4578beb (Improved docstrings in convolution)
def forward(self, x: torch.Tensor) -> torch.Tensor: def forward(self, x: torch.Tensor) -> torch.Tensor:
""" """
Forward pass Forward pass
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment