ocnn 2.2.2__tar.gz → 2.2.3__tar.gz

{ocnn-2.2.2/ocnn.egg-info → ocnn-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocnn
-Version: 2.2.2
+Version: 2.2.3
 Summary: Octree-based Sparse Convolutional Neural Networks
 Home-page: https://github.com/octree-nn/ocnn-pytorch
 Author: Peng-Shuai Wang
@@ -43,14 +43,14 @@ The key difference is that our O-CNN uses the `octree` to index the sparse
 voxels, while these 3 works use the `Hash Table`.
 
 Our O-CNN is published in SIGGRAPH 2017, H-CNN is published in TVCG 2018,
-SparseConvNet is published in CVPR 2018, and MinkowskiNet is published in 
+SparseConvNet is published in CVPR 2018, and MinkowskiNet is published in
 CVPR 2019. Actually, our O-CNN was submitted to SIGGRAPH in the end of 2016 and
 was officially accepted in March, 2017. The camera-ready version of our O-CNN was
 submitted to SIGGRAPH in April, 2017. We just did not post our paper on Arxiv
 during the review process of SIGGRAPH. Therefore, **the idea of constraining CNN
 computation into sparse non-emtpry voxels is first proposed by our O-CNN**.
 Currently, this type of 3D convolution is known as Sparse Convolution in the
-research community. 
+research community.
 
 ## Key benefits of ocnn-pytorch
 
@@ -65,3 +65,15 @@ research community.
   training settings, MinkowskiNet 0.4.3 takes 60 hours and MinkowskiNet 0.5.4
   takes 30 hours.
 
+## Citation
+
+  ```bibtex
+  @article {Wang-2017-ocnn,
+    title    = {{O-CNN}: Octree-based Convolutional Neural Networksfor {3D} Shape Analysis},
+    author   = {Wang, Peng-Shuai and Liu, Yang and Guo, Yu-Xiao and Sun, Chun-Yu and Tong, Xin},
+    journal  = {ACM Transactions on Graphics (SIGGRAPH)},
+    volume   = {36},
+    number   = {4},
+    year     = {2017},
+  }
+  ```

{ocnn-2.2.2 → ocnn-2.2.3}/README.md

@@ -24,14 +24,14 @@ The key difference is that our O-CNN uses the `octree` to index the sparse
 voxels, while these 3 works use the `Hash Table`.
 
 Our O-CNN is published in SIGGRAPH 2017, H-CNN is published in TVCG 2018,
-SparseConvNet is published in CVPR 2018, and MinkowskiNet is published in 
+SparseConvNet is published in CVPR 2018, and MinkowskiNet is published in
 CVPR 2019. Actually, our O-CNN was submitted to SIGGRAPH in the end of 2016 and
 was officially accepted in March, 2017. The camera-ready version of our O-CNN was
 submitted to SIGGRAPH in April, 2017. We just did not post our paper on Arxiv
 during the review process of SIGGRAPH. Therefore, **the idea of constraining CNN
 computation into sparse non-emtpry voxels is first proposed by our O-CNN**.
 Currently, this type of 3D convolution is known as Sparse Convolution in the
-research community. 
+research community.
 
 ## Key benefits of ocnn-pytorch
 
@@ -46,3 +46,15 @@ research community.
   training settings, MinkowskiNet 0.4.3 takes 60 hours and MinkowskiNet 0.5.4
   takes 30 hours.
 
+## Citation
+
+  ```bibtex
+  @article {Wang-2017-ocnn,
+    title    = {{O-CNN}: Octree-based Convolutional Neural Networksfor {3D} Shape Analysis},
+    author   = {Wang, Peng-Shuai and Liu, Yang and Guo, Yu-Xiao and Sun, Chun-Yu and Tong, Xin},
+    journal  = {ACM Transactions on Graphics (SIGGRAPH)},
+    volume   = {36},
+    number   = {4},
+    year     = {2017},
+  }
+  ```

{ocnn-2.2.2 → ocnn-2.2.3}/ocnn/__init__.py

@@ -12,7 +12,7 @@ from . import models
 from . import dataset
 from . import utils
 
-__version__ = '2.2.2'
+__version__ = '2.2.3'
 
 __all__ = [
     'octree',

{ocnn-2.2.2 → ocnn-2.2.3}/ocnn/models/lenet.py

@@ -26,7 +26,7 @@ class LeNet(torch.nn.Module):
     self.convs = torch.nn.ModuleList([ocnn.modules.OctreeConvBnRelu(
         channels[i], channels[i+1], nempty=nempty) for i in range(stages)])
     self.pools = torch.nn.ModuleList([ocnn.nn.OctreeMaxPool(
-        nempty) for i in range(stages)])
+        nempty) for _ in range(stages)])
     self.octree2voxel = ocnn.nn.Octree2Voxel(self.nempty)
     self.header = torch.nn.Sequential(
         torch.nn.Dropout(p=0.5),                     # drop1

{ocnn-2.2.2 → ocnn-2.2.3}/ocnn/nn/__init__.py

@@ -15,6 +15,7 @@ from .octree_pool import (octree_max_pool, OctreeMaxPool,
                           octree_global_pool, OctreeGlobalPool,
                           octree_avg_pool, OctreeAvgPool,)
 from .octree_conv import OctreeConv, OctreeDeconv
+from .octree_gconv import OctreeGroupConv
 from .octree_dwconv import OctreeDWConv
 from .octree_norm import OctreeBatchNorm, OctreeGroupNorm, OctreeInstanceNorm
 from .octree_drop import OctreeDropPath
@@ -32,7 +33,7 @@ __all__ = [
     'OctreeMaxPool', 'OctreeMaxUnpool',
     'OctreeGlobalPool', 'OctreeAvgPool',
     'OctreeConv', 'OctreeDeconv',
-    'OctreeDWConv',
+    'OctreeGroupConv', 'OctreeDWConv',
     'OctreeInterp', 'OctreeUpsample',
     'OctreeInstanceNorm', 'OctreeBatchNorm', 'OctreeGroupNorm',
     'OctreeDropPath',

{ocnn-2.2.2 → ocnn-2.2.3}/ocnn/nn/octree_conv.py

@@ -109,6 +109,12 @@ class OctreeConvBase:
     r''' Peforms the forward pass of octree-based convolution.
     '''
 
+    # Type check
+    if data.dtype != out.dtype:
+      data = data.to(out.dtype)
+    if weights.dtype != out.dtype:
+      weights = weights.to(out.dtype)
+
     # Initialize the buffer
     buffer = data.new_empty(self.buffer_shape)
 
@@ -139,6 +145,12 @@ class OctreeConvBase:
     r''' Performs the backward pass of octree-based convolution.
     '''
 
+    # Type check
+    if grad.dtype != out.dtype:
+      grad = grad.to(out.dtype)
+    if weights.dtype != out.dtype:
+      weights = weights.to(out.dtype)
+
     # Loop over each sub-matrix
     for i in range(self.buffer_n):
       start = i * self.buffer_h
@@ -165,6 +177,12 @@ class OctreeConvBase:
     r''' Computes the gradient of the weight matrix.
     '''
 
+    # Type check
+    if data.dtype != out.dtype:
+      data = data.to(out.dtype)
+    if grad.dtype != out.dtype:
+      grad = grad.to(out.dtype)
+
     # Record the shape of out
     out_shape = out.shape
     out = out.flatten(0, 1)

{ocnn-2.2.2 → ocnn-2.2.3}/ocnn/nn/octree_dwconv.py

@@ -32,6 +32,12 @@ class OctreeDWConvBase(OctreeConvBase):
     r''' Peforms the forward pass of octree-based convolution.
     '''
 
+    # Type check
+    if data.dtype != out.dtype:
+      data = data.to(out.dtype)
+    if weights.dtype != out.dtype:
+      weights = weights.to(out.dtype)
+
     # Initialize the buffer
     buffer = data.new_empty(self.buffer_shape)
 
@@ -62,6 +68,12 @@ class OctreeDWConvBase(OctreeConvBase):
     r''' Performs the backward pass of octree-based convolution. 
     '''
 
+    # Type check
+    if grad.dtype != out.dtype:
+      grad = grad.to(out.dtype)
+    if weights.dtype != out.dtype:
+      weights = weights.to(out.dtype)
+
     # Loop over each sub-matrix
     for i in range(self.buffer_n):
       start = i * self.buffer_h
@@ -88,6 +100,12 @@ class OctreeDWConvBase(OctreeConvBase):
     r''' Computes the gradient of the weight matrix.
     '''
 
+    # Type check
+    if data.dtype != out.dtype:
+      data = data.to(out.dtype)
+    if grad.dtype != out.dtype:
+      grad = grad.to(out.dtype)
+
     # Record the shape of out
     out_shape = out.shape
     out = out.flatten(0, 1)

{ocnn-2.2.2 → ocnn-2.2.3}/ocnn/octree/octree.py

@@ -274,7 +274,7 @@ class Octree:
       children[0] = 0
 
     # update octree
-    self.children[depth] = children
+    self.children[depth] = children.int()
     self.nnum_nempty[depth] = nnum_nempty
 
   def octree_grow(self, depth: int, update_neigh: bool = True):
@@ -498,7 +498,7 @@ class Octree:
     # normalize xyz to [-1, 1] since the average points are in range [0, 2^d]
     if rescale:
       scale = 2 ** (1 - depth)
-      xyz = self.points[depth] * scale - 1.0
+      xyz = xyz * scale - 1.0
 
     # construct Points
     out = Points(xyz, self.normals[depth], self.features[depth],

{ocnn-2.2.2 → ocnn-2.2.3}/ocnn/octree/points.py

@@ -56,11 +56,16 @@ class Points:
       assert self.features.dim() == 2
       assert self.features.size(0) == self.points.size(0)
     if self.labels is not None:
-      assert self.labels.dim() == 2
+      assert self.labels.dim() == 2 or self.labels.dim() == 1
       assert self.labels.size(0) == self.points.size(0)
+      if self.labels.dim() == 1:
+        self.labels = self.labels.unsqueeze(1)
     if self.batch_id is not None:
-      assert self.batch_id.dim() == 2 and self.batch_id.size(1) == 1
+      assert self.batch_id.dim() == 2 or self.batch_id.dim() == 1
       assert self.batch_id.size(0) == self.points.size(0)
+      assert self.batch_id.size(1) == 1
+      if self.batch_id.dim() == 1:
+        self.batch_id = self.batch_id.unsqueeze(1)
 
   @property
   def npt(self):

{ocnn-2.2.2 → ocnn-2.2.3}/ocnn/utils.py

@@ -173,7 +173,7 @@ def resize_with_last_val(list_in: list, num: int = 3):
   '''
 
   assert (type(list_in) is list and len(list_in) < num + 1)
-  for i in range(len(list_in), num):
+  for _ in range(len(list_in), num):
     list_in.append(list_in[-1])
   return list_in
 
@@ -186,15 +186,18 @@ def list2str(list_in: list):
   return ''.join(out)
 
 
-def build_example_octree(depth: int = 5, full_depth: int = 2):
-  r''' Builds an example octree on CPU from 3 points.
+def build_example_octree(depth: int = 5, full_depth: int = 2, pt_num: int = 3):
+  r''' Builds an example octree on CPU from at most 3 points.
   '''
   # initialize the point cloud
   points = torch.Tensor([[-1, -1, -1], [0, 0, -1], [0.0625, 0.0625, -1]])
   normals = torch.Tensor([[1, 0, 0], [-1, 0, 0], [0, 1, 0]])
   features = torch.Tensor([[1, -1], [2, -2], [3, -3]])
   labels = torch.Tensor([[0], [2], [2]])
-  point_cloud = ocnn.octree.Points(points, normals, features, labels)
+
+  assert pt_num <= 3 and pt_num > 0
+  point_cloud = ocnn.octree.Points(
+      points[:pt_num], normals[:pt_num], features[:pt_num], labels[:pt_num])
 
   # build octree
   octree = ocnn.octree.Octree(depth, full_depth)

{ocnn-2.2.2 → ocnn-2.2.3/ocnn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocnn
-Version: 2.2.2
+Version: 2.2.3
 Summary: Octree-based Sparse Convolutional Neural Networks
 Home-page: https://github.com/octree-nn/ocnn-pytorch
 Author: Peng-Shuai Wang
@@ -43,14 +43,14 @@ The key difference is that our O-CNN uses the `octree` to index the sparse
 voxels, while these 3 works use the `Hash Table`.
 
 Our O-CNN is published in SIGGRAPH 2017, H-CNN is published in TVCG 2018,
-SparseConvNet is published in CVPR 2018, and MinkowskiNet is published in 
+SparseConvNet is published in CVPR 2018, and MinkowskiNet is published in
 CVPR 2019. Actually, our O-CNN was submitted to SIGGRAPH in the end of 2016 and
 was officially accepted in March, 2017. The camera-ready version of our O-CNN was
 submitted to SIGGRAPH in April, 2017. We just did not post our paper on Arxiv
 during the review process of SIGGRAPH. Therefore, **the idea of constraining CNN
 computation into sparse non-emtpry voxels is first proposed by our O-CNN**.
 Currently, this type of 3D convolution is known as Sparse Convolution in the
-research community. 
+research community.
 
 ## Key benefits of ocnn-pytorch
 
@@ -65,3 +65,15 @@ research community.
   training settings, MinkowskiNet 0.4.3 takes 60 hours and MinkowskiNet 0.5.4
   takes 30 hours.
 
+## Citation
+
+  ```bibtex
+  @article {Wang-2017-ocnn,
+    title    = {{O-CNN}: Octree-based Convolutional Neural Networksfor {3D} Shape Analysis},
+    author   = {Wang, Peng-Shuai and Liu, Yang and Guo, Yu-Xiao and Sun, Chun-Yu and Tong, Xin},
+    journal  = {ACM Transactions on Graphics (SIGGRAPH)},
+    volume   = {36},
+    number   = {4},
+    year     = {2017},
+  }
+  ```

{ocnn-2.2.2 → ocnn-2.2.3}/setup.py

@@ -7,7 +7,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = '2.2.2'
+__version__ = '2.2.3'
 
 with open("README.md", "r", encoding="utf-8") as fid:
   long_description = fid.read()