conv/convtr feature type dispatcher

NVIDIA · Dec 15, 2020 · f27bda1 · f27bda1
1 parent 97d5417
commit f27bda1
Show file tree

Hide file tree

Showing 19 changed files with 493 additions and 677 deletions.
diff --git a/MinkowskiEngine/MinkowskiCommon.py b/MinkowskiEngine/MinkowskiCommon.py
@@ -122,12 +122,12 @@ def prep_args(
 
 def get_postfix(tensor: torch.Tensor):
     postfix = "GPU" if tensor.is_cuda else "CPU"
-    if isinstance(tensor, torch.DoubleTensor) or isinstance(
-        tensor, torch.cuda.DoubleTensor
-    ):
-        postfix += "d"
-    else:
-        postfix += "f"
+    # if isinstance(tensor, torch.DoubleTensor) or isinstance(
+    #     tensor, torch.cuda.DoubleTensor
+    # ):
+    #     postfix += "d"
+    # else:
+    #     postfix += "f"
     return postfix
 
 

diff --git a/MinkowskiEngine/MinkowskiConvolution.py b/MinkowskiEngine/MinkowskiConvolution.py
@@ -42,6 +42,7 @@
 
 
 class MinkowskiConvolutionFunction(Function):
+
     @staticmethod
     def forward(
         ctx,
@@ -201,7 +202,7 @@ class MinkowskiConvolutionBase(MinkowskiModuleBase):
         "kernel_generator",
         "dimension",
         "use_mm",
-        "weight",
+        "kernel",
         "bias",
         "conv",
     )
@@ -248,7 +249,7 @@ def __init__(
         Tensor = torch.FloatTensor
         if (
             self.kernel_generator.kernel_volume == 1
-            and self.kernel_generator.requires_strided_coordiantes
+            and self.kernel_generator.requires_strided_coordinates
         ):
             kernel_shape = (self.in_channels, self.out_channels)
             self.use_mm = True
@@ -259,7 +260,7 @@ def __init__(
                 self.out_channels,
             )
 
-        self.weight = Parameter(Tensor(*kernel_shape))
+        self.kernel = Parameter(Tensor(*kernel_shape))
         self.bias = Parameter(Tensor(1, out_channels)) if bias else None
         self.conv = (
             MinkowskiConvolutionTransposeFunction()
@@ -294,7 +295,7 @@ def forward(
             out_coordinate_map_key = _get_coordinate_map_key(input, coordinates)
             outfeat = self.conv.apply(
                 input.F,
-                self.weight,
+                self.kernel,
                 self.kernel_generator,
                 input.coordinate_map_key,
                 out_coordinate_map_key,
@@ -314,7 +315,7 @@ def reset_parameters(self, is_transpose=False):
             self.out_channels if is_transpose else self.in_channels
         ) * self.kernel_generator.kernel_volume
         stdv = 1.0 / math.sqrt(n)
-        self.weight.data.uniform_(-stdv, stdv)
+        self.kernel.data.uniform_(-stdv, stdv)
         if self.bias is not None:
             self.bias.data.uniform_(-stdv, stdv)
 

diff --git a/MinkowskiEngine/MinkowskiNonlinearity.py b/MinkowskiEngine/MinkowskiNonlinearity.py
@@ -24,7 +24,7 @@
 import torch
 from torch.nn import Module
 
-from SparseTensor import SparseTensor
+from MinkowskiSparseTensor import SparseTensor
 
 
 class MinkowskiModuleBase(Module):
@@ -38,8 +38,8 @@ def forward(self, input):
         output = self.module(input.F)
         return SparseTensor(
             output,
-            coords_key=input.coords_key,
-            coords_manager=input.coords_man)
+            coordinate_map_key=input.coordinate_map_key,
+            coordinate_manager=input.coordinate_manager)
 
     def __repr__(self):
         return self.__class__.__name__ + '()'