ocnn 2.2.4__tar.gz → 2.2.5__tar.gz

{ocnn-2.2.4/ocnn.egg-info → ocnn-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocnn
-Version: 2.2.4
+Version: 2.2.5
 Summary: Octree-based Sparse Convolutional Neural Networks
 Home-page: https://github.com/octree-nn/ocnn-pytorch
 Author: Peng-Shuai Wang

{ocnn-2.2.4 → ocnn-2.2.5}/ocnn/__init__.py

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

{ocnn-2.2.4 → ocnn-2.2.5}/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-2.2.4 → ocnn-2.2.5}/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-2.2.4 → ocnn-2.2.5}/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,
@@ -176,7 +178,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 +289,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-2.2.4 → ocnn-2.2.5/ocnn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocnn
-Version: 2.2.4
+Version: 2.2.5
 Summary: Octree-based Sparse Convolutional Neural Networks
 Home-page: https://github.com/octree-nn/ocnn-pytorch
 Author: Peng-Shuai Wang

{ocnn-2.2.4 → ocnn-2.2.5}/setup.py

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