ocnn 2.2.4__py3-none-any.whl → 2.2.6__py3-none-any.whl

ocnn/__init__.py

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

ocnn/models/autoencoder.py

@@ -33,8 +33,9 @@ class AutoEncoder(torch.nn.Module):
     self.full_depth = full_depth
     self.feature = feature
     self.resblk_num = 2
-    self.code_channel = 64  # dim-of-code = code_channel * 2**(3*full_depth)
     self.channels = [512, 512, 256, 256, 128, 128, 32, 32, 16, 16]
+    # dim-of-code = code_channel * 2**(3*full_depth)
+    self.code_channel = self.channels[full_depth]
 
     # encoder
     self.conv1 = ocnn.modules.OctreeConvBnRelu(

ocnn/models/ounet.py

@@ -18,8 +18,7 @@ class OUNet(AutoEncoder):
 
   def __init__(self, channel_in: int, channel_out: int, depth: int,
                full_depth: int = 2, feature: str = 'ND'):
-    super().__init__(channel_in, channel_out, depth, full_depth, feature,
-                     code_channel=-1)  # !set code_channe=-1
+    super().__init__(channel_in, channel_out, depth, full_depth, feature)
     self.proj = None  # remove this module used in AutoEncoder
 
   def encoder(self, octree):

ocnn/octree/octree.py

@@ -35,7 +35,9 @@ class Octree:
     and :obj:`points`, contain only non-empty nodes.
 
   .. note::
-    The point cloud must be in range :obj:`[-1, 1]`.
+    The point cloud must be strictly in range :obj:`[-1, 1]`. A good practice
+    is to normalize it into :obj:`[-0.99, 0.99]` or :obj:`[0.9, 0.9]` to retain
+    some margin.
   '''
 
   def __init__(self, depth: int, full_depth: int = 2, batch_size: int = 1,
@@ -151,7 +153,9 @@ class Octree:
       point_cloud (Points): The input point cloud.
 
     .. note::
-      Currently, the batch size of the point cloud must be 1.
+      The point cloud must be strictly in range :obj:`[-1, 1]`. A good practice
+      is to normalize it into :obj:`[-0.99, 0.99]` or :obj:`[0.9, 0.9]` to retain
+      some margin.
     '''
 
     self.device = point_cloud.device
@@ -176,7 +180,7 @@ class Octree:
     for d in range(self.depth, self.full_depth, -1):
       # compute parent key, i.e. keys of layer (d -1)
       pkey = node_key >> 3
-      pkey, pidx, pcounts = torch.unique_consecutive(
+      pkey, pidx, _ = torch.unique_consecutive(
           pkey, return_inverse=True, return_counts=True)
 
       # augmented key
@@ -287,6 +291,23 @@ class Octree:
       update_neigh (bool): If True, construct the neighborhood indices.
     '''
 
+    # increase the octree depth if required
+    if depth > self.depth:
+      assert depth == self.depth + 1
+      self.depth = depth
+      self.keys.append(None)
+      self.children.append(None)
+      self.neighs.append(None)
+      self.features.append(None)
+      self.normals.append(None)
+      self.points.append(None)
+      zero = torch.zeros(1, dtype=torch.long)
+      self.nnum = torch.cat([self.nnum, zero])
+      self.nnum_nempty = torch.cat([self.nnum_nempty, zero])
+      zero = zero.view(1, 1)
+      self.batch_nnum = torch.cat([self.batch_nnum, zero], dim=0)
+      self.batch_nnum_nempty = torch.cat([self.batch_nnum_nempty, zero], dim=0)
+
     # node number
     nnum = self.nnum_nempty[depth-1] * 8
     self.nnum[depth] = nnum

ocnn/octree/points.py

@@ -63,9 +63,9 @@ class Points:
     if self.batch_id is not None:
       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)
+      assert self.batch_id.size(1) == 1
 
   @property
   def npt(self):

{ocnn-2.2.4.dist-info → ocnn-2.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocnn
-Version: 2.2.4
+Version: 2.2.6
 Summary: Octree-based Sparse Convolutional Neural Networks
 Home-page: https://github.com/octree-nn/ocnn-pytorch
 Author: Peng-Shuai Wang
@@ -28,30 +28,41 @@ Requires-Dist: packaging
 
 This repository contains the **pure PyTorch**-based implementation of
 [O-CNN](https://wang-ps.github.io/O-CNN.html). The code has been tested with
-`Pytorch>=1.6.0`, and `Pytorch>=1.9.0` is preferred.
+`Pytorch>=1.6.0`, and `Pytorch>=1.9.0` is preferred. The *original*
+implementation of O-CNN is based on C++ and CUDA and can be found
+[here](https://github.com/Microsoft/O-CNN), which has received
+[![stars - O-CNN](https://img.shields.io/github/stars/microsoft/O-CNN?style=social)](https://github.com/microsoft/O-CNN) and
+[![forks - O-CNN](https://img.shields.io/github/forks/microsoft/O-CNN?style=social)](https://github.com/microsoft/O-CNN).
 
-O-CNN is an octree-based sparse convolutional neural network framework for 3D
-deep learning. O-CNN constrains the CNN storage and computation into non-empty
-sparse voxels for efficiency and uses the `octree` data structure to organize
-and index these sparse voxels.
 
-The concept of sparse convolution in O-CNN is the same with
-[H-CNN](https://ieeexplore.ieee.org/abstract/document/8580422),
+O-CNN is an octree-based 3D convolutional neural network framework for 3D data.
+O-CNN constrains the CNN storage and computation into non-empty sparse voxels
+for efficiency and uses the `octree` data structure to organize and index these
+sparse voxels. Currently, this type of 3D convolution is known as Sparse
+Convolution in the research community.
+
+
+The concept of Sparse Convolution in O-CNN is the same with
 [SparseConvNet](https://openaccess.thecvf.com/content_cvpr_2018/papers/Graham_3D_Semantic_Segmentation_CVPR_2018_paper.pdf),
-and
-[MinkowskiNet](https://openaccess.thecvf.com/content_CVPR_2019/papers/Choy_4D_Spatio-Temporal_ConvNets_Minkowski_Convolutional_Neural_Networks_CVPR_2019_paper.pdf).
-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
-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.
+[MinkowskiNet](https://github.com/NVIDIA/MinkowskiEngine), and
+[SpConv](https://github.com/traveller59/spconv).
+The key difference is that our O-CNN uses `octrees` to index the sparse voxels,
+while these works use `Hash Tables`. However, I believe that `octrees` may be
+the right choice for Sparse Convolution. With `octrees`, I can implement the
+Sparse Convolution with pure PyTorch. More importantly, with `octrees`, I can
+also build efficient transformers for 3D data --
+[OctFormer](https://github.com/octree-nn/octformer), which is extremely hard
+with `Hash Tables`.
+
+
+Our O-CNN is published in SIGGRAPH 2017, 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, 2018. -->
+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, i.e. Sparse Convolution,  is first proposed by our O-CNN**.
+
 
 ## Key benefits of ocnn-pytorch
 

{ocnn-2.2.4.dist-info → ocnn-2.2.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
-ocnn/__init__.py,sha256=Fdq7gwK0CNhErDf-3rX7M-zbqj1RQbBQNoGI5bBTMOg,582
+ocnn/__init__.py,sha256=Vek3w8YFUUmHO2aGzIHBD_ZUeKzWyJxAPS0ZDK1bUUM,582
 ocnn/dataset.py,sha256=wvclvjlZs9qTeMXWLaO32K5d1VVY9XHSNuVVJEpVeeo,5266
 ocnn/utils.py,sha256=XhykveOjHoQd94gjJ5-opzXs-9MOCAzZ34ArZ8mG4sE,6726
 ocnn/models/__init__.py,sha256=F9PJRhOPHc1OrwkqcfywEBW0J6jmVW7-IHgWjGpY15U,724
-ocnn/models/autoencoder.py,sha256=aCGuouaia0qXxKB8mQ-wLnM7liwnn2JZGLiNLo9g6kg,5877
+ocnn/models/autoencoder.py,sha256=nkKMtSPPdKhQXRxFaRNZsPjRfWuQet5Gz9FQlyLUlEQ,5904
 ocnn/models/hrnet.py,sha256=9W2fi7Fuw0JXDBiZtEoUW2K7ghtpWUm_BWd-mKoHLY0,6684
 ocnn/models/image2shape.py,sha256=5djcOHJh2SQCwd5XdLPeL5vlQDNWnRU3tJY3ojRI8aQ,4589
 ocnn/models/lenet.py,sha256=ujVBxnn8AKiIKqB4WHxuK728oJe4TZdqZUTTNy8y3zE,1754
-ocnn/models/ounet.py,sha256=PcoOQiEQqWmtvfpA4zNAce8ijATiiYa-17DKdWkUm7A,3368
+ocnn/models/ounet.py,sha256=Z9bJqt_C8uHNw5IzD7q2vR1CH5bMkOrtI0UWSyp74TU,3306
 ocnn/models/resnet.py,sha256=_bRaLBYK5yVqklYEvfPjcndWvMpOKaygnSl1pyjT-4w,2029
 ocnn/models/segnet.py,sha256=A3KWF-kJQ1M-ByJKv88wfMsdZYccBzP_p9W_0EzNB6w,2575
 ocnn/models/unet.py,sha256=1FZbTvmWg6sMYkcZyNxcSr_qN6bfOOag-tIwAoqIPKU,4123
@@ -26,11 +26,11 @@ ocnn/nn/octree_norm.py,sha256=XrSQ7oZKfepYqQIuPU4loaYNae_rgtPpekR0cqTvryg,4524
 ocnn/nn/octree_pad.py,sha256=suV6Ftb-UlUuoJzKdQ9DCP9oqVQJq7vXb9_6hq-kUk4,1323
 ocnn/nn/octree_pool.py,sha256=Zn2XLk5SFl6pqMhhKIvu1uZl5ebonFSlPcKr54fOIPA,6664
 ocnn/octree/__init__.py,sha256=vKZFc5_r6Gxg5KsPWiCZCR-umWWfWPoE7qBx4PIrUGA,630
-ocnn/octree/octree.py,sha256=Ir1jP_s4jrTVGtFZAY3zCaTLpekDHqtoSvGDJG84_QQ,23803
-ocnn/octree/points.py,sha256=7_iiN0y0g9SgV8kLzuGW20C-MFOmz5hh1aQhDhUIa0Q,11355
+ocnn/octree/octree.py,sha256=uFv0nNR_lIh6SgpDjlj4lraRbUolo2_gdfGVvyP5RxA,24711
+ocnn/octree/points.py,sha256=TLlUGdguTkLDRxuEhC-1ejik6thuAWX3L-UiONbPLeM,11355
 ocnn/octree/shuffled_key.py,sha256=UJZ4eKNA_7nLbf9FbEvS_3VyrAqnZCOzk1hsPtJianM,3936
-ocnn-2.2.4.dist-info/LICENSE,sha256=YeOS0Plo8Uistv_8ZXdgddmN9GHJKnIiJ5FZ8zTW6Sw,1114
-ocnn-2.2.4.dist-info/METADATA,sha256=M2KsDEZXmlZ3sli4dNixbGVyNLF7qN-CpLjf9OZP_vg,3773
-ocnn-2.2.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ocnn-2.2.4.dist-info/top_level.txt,sha256=ayZdVOnxlOke3kgzAlrRh2IEL_qOudwOaEU3xhjtpZ0,5
-ocnn-2.2.4.dist-info/RECORD,,
+ocnn-2.2.6.dist-info/LICENSE,sha256=YeOS0Plo8Uistv_8ZXdgddmN9GHJKnIiJ5FZ8zTW6Sw,1114
+ocnn-2.2.6.dist-info/METADATA,sha256=pMj-GJiTUtxvjtjhBLQcBMi1CXZlU3NBiQKxHiPJR8M,4382
+ocnn-2.2.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ocnn-2.2.6.dist-info/top_level.txt,sha256=ayZdVOnxlOke3kgzAlrRh2IEL_qOudwOaEU3xhjtpZ0,5
+ocnn-2.2.6.dist-info/RECORD,,

{ocnn-2.2.4.dist-info → ocnn-2.2.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any