learning3d 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

{learning3d/examples → examples}/train_rpmnet.py

@@ -146,8 +146,6 @@ def options():
 						metavar='DATASET', help='dataset type (default: modelnet)')
 	parser.add_argument('--num_points', default=1024, type=int,
 						metavar='N', help='points in point-cloud (default: 1024)')
-	parser.add_argument('--root_dir', default='./', type=str, 
-					 	help='path of the data where modelnet files are downloaded.')
 
 	# settings for PointNet
 	parser.add_argument('--fine_tune_pointnet', default='tune', type=str, choices=['fixed', 'tune'],
@@ -196,8 +194,8 @@ def main():
 	textio.cprint(str(args))
 
 	
-	trainset = RegistrationData('RPMNet', ModelNet40Data(train=True, num_points=args.num_points, use_normals=True, root_dir=args.root_dir), partial_source=True, partial_template=True)
-	testset = RegistrationData('RPMNet', ModelNet40Data(train=False, num_points=args.num_points, use_normals=True, root_dir=args.root_dir), partial_source=True, partial_template=True)
+	trainset = RegistrationData('RPMNet', ModelNet40Data(train=True, num_points=args.num_points, use_normals=True), partial_source=True, partial_template=True)
+	testset = RegistrationData('RPMNet', ModelNet40Data(train=False, num_points=args.num_points, use_normals=True), partial_source=True, partial_template=True)
 	train_loader = DataLoader(trainset, batch_size=args.batch_size, shuffle=True, drop_last=True, num_workers=args.workers)
 	test_loader = DataLoader(testset, batch_size=8, shuffle=False, drop_last=False, num_workers=args.workers)
 

{learning3d-0.1.0.dist-info → learning3d-0.2.0.dist-info}/METADATA

@@ -1,10 +1,35 @@
 Metadata-Version: 2.1
 Name: learning3d
-Version: 0.1.0
+Version: 0.2.0
 Summary: Learning3D: A Modern Library for Deep Learning on 3D Point Clouds Data
 Author-email: Vinit Sarode <vinitsarode5@gmail.com>
+Maintainer-email: Vinit Sarode <vinitsarode5@gmail.com>
+License: The MIT License
+        
+        Copyright (c) 2010-2019 Google, Inc. http://angularjs.org
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in
+        all copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+        THE SOFTWARE.
 Project-URL: Homepage, https://github.com/vinits5/learning3d
+Project-URL: Repository, https://github.com/vinits5/learning3d
 Project-URL: Issues, https://github.com/vinits5/learning3d/issues
+Project-URL: Changelog, https://github.com/vinits5/learning3d/CHANGELOG.md
+Keywords: Point Clouds,Deep Learning,3D Vision,Point Cloud Registration,Point Cloud Classification,Point Cloud Segmentation
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -22,6 +47,7 @@ Requires-Dist: scikit-learn ==1.2.2
 Requires-Dist: scipy ==1.10.1
 Requires-Dist: numpy ==1.24.3
 Requires-Dist: transforms3d ==0.4.1
+Requires-Dist: pycuda
 
 <p align="center">
 	<img src="https://github.com/vinits5/learning3d/blob/master/images/logo.png" height="170">
@@ -34,24 +60,40 @@ Requires-Dist: transforms3d ==0.4.1
 Learning3D is an open-source library that supports the development of deep learning algorithms that deal with 3D data. The Learning3D exposes a set of state of art deep neural networks in python. A modular code has been provided for further development. We welcome contributions from the open-source community.
 
 ## Latest News:
-1. \[24 Oct, 2023\]: [MaskNet++](https://github.com/zhouruqin/MaskNet2) is now a part of learning3d library.
-2. \[12 May, 2022\]: [ChamferDistance](https://github.com/fwilliams/fml) loss function is incorporated in learning3d. This is a purely pytorch based loss function.
-3. \[24 Dec. 2020\]: [MaskNet](https://arxiv.org/pdf/2010.09185.pdf) is now ready to enhance the performance of registration algorithms in learning3d for occluded point clouds.
-4. \[24 Dec. 2020\]: Loss based on the predicted and ground truth correspondences is added in learning3d after consideration of [Correspondence Matrices are Underrated](https://arxiv.org/pdf/2010.16085.pdf) paper.
-5. \[24 Dec. 2020\]: [PointConv](https://arxiv.org/abs/1811.07246), latent feature estimation using convolutions on point clouds is now available in learning3d.
-6. \[16 Oct. 2020\]: [DeepGMR](https://wentaoyuan.github.io/deepgmr/), registration using gaussian mixture models is now available in learning3d
-7. \[14 Oct. 2020\]: Now, use your own data in learning3d. (Check out [UserData](https://github.com/vinits5/learning3d#use-your-own-data) functionality!)
+1. \[28 Feb, 2025\]: [CurveNet](https://github.com/tiangexiang/CurveNet) is now a part of learning3d library.
+2. \[7 Apr, 2024\]: Now, learning3d is available as pypi package.
+3. \[24 Oct, 2023\]: [MaskNet++](https://github.com/zhouruqin/MaskNet2) is now a part of learning3d library.
+4. \[12 May, 2022\]: [ChamferDistance](https://github.com/fwilliams/fml) loss function is incorporated in learning3d. This is a purely pytorch based loss function.
+5. \[24 Dec. 2020\]: [MaskNet](https://arxiv.org/pdf/2010.09185.pdf) is now ready to enhance the performance of registration algorithms in learning3d for occluded point clouds.
+6. \[24 Dec. 2020\]: Loss based on the predicted and ground truth correspondences is added in learning3d after consideration of [Correspondence Matrices are Underrated](https://arxiv.org/pdf/2010.16085.pdf) paper.
+7. \[24 Dec. 2020\]: [PointConv](https://arxiv.org/abs/1811.07246), latent feature estimation using convolutions on point clouds is now available in learning3d.
+8. \[16 Oct. 2020\]: [DeepGMR](https://wentaoyuan.github.io/deepgmr/), registration using gaussian mixture models is now available in learning3d
+9. \[14 Oct. 2020\]: Now, use your own data in learning3d. (Check out [UserData](https://github.com/vinits5/learning3d#use-your-own-data) functionality!)
+
+## PyPI package setup
+### Setup from pypi server
+```
+pip install learning3d
+```
+
+### Setup using code
+```
+git clone https://github.com/vinits5/learning3d.git
+cd learning3d
+git checkout pypi_v0.1.0
+python3 -m pip install .
+```
 
 ## Available Computer Vision Algorithms in Learning3D
 
 | Sr. No.       | Tasks         | Algorithms  |
 |:-------------:|:----------:|:-----|
-| 1 | [Classification](https://github.com/vinits5/learning3d#use-of-classification--segmentation-network) | PointNet, DGCNN, PPFNet, [PointConv](https://github.com/vinits5/learning3d#use-of-pointconv) |
+| 1 | [Classification](https://github.com/vinits5/learning3d#use-of-classification--segmentation-network) | PointNet, DGCNN, PPFNet, [PointConv](https://github.com/vinits5/learning3d#use-of-pointconv), [CurveNet](https://github.com/tiangexiang/CurveNet) |
 | 2 | [Segmentation](https://github.com/vinits5/learning3d#use-of-classification--segmentation-network) | PointNet, DGCNN |
 | 3 | [Reconstruction](https://github.com/vinits5/learning3d#use-of-point-completion-network) | Point Completion Network (PCN) |
 | 4 | [Registration](https://github.com/vinits5/learning3d#use-of-registration-networks) | PointNetLK, PCRNet, DCP, PRNet, RPM-Net, DeepGMR |
 | 5 | [Flow Estimation](https://github.com/vinits5/learning3d#use-of-flow-estimation-network) | FlowNet3D |
-| 6 | [Inlier Estimation](https://github.com/vinits5/learning3d#use-of-inlier-estimation-network-masknet) | MaskNet, MaskNet++ | 
+| 6 | [Inlier Estimation](https://github.com/vinits5/learning3d#use-of-inlier-estimation-network-masknet) | MaskNet, [MaskNet++](https://github.com/zhouruqin/MaskNet2) | 
 
 ## Available Pretrained Models
 1. PointNet
@@ -66,6 +108,7 @@ Learning3D is an open-source library that supports the development of deep learn
 10. PointConv (Download from this [link](https://github.com/DylanWusee/pointconv_pytorch/blob/master/checkpoints/checkpoint.pth))
 11. MaskNet
 12. MaskNet++ / MaskNet2
+13. CurveNet
 
 ## Available Datasets
 1. ModelNet40
@@ -81,7 +124,8 @@ Learning3D is an open-source library that supports the development of deep learn
 1. Ubuntu 16.04
 2. Ubuntu 18.04
 3. Ubuntu 20.04.6
-3. Linux Mint
+4. Linux Mint
+5. macOS Sequoia 15.3.1
 
 ### Requirements
 1. CUDA 10.0 or higher
@@ -268,3 +312,4 @@ PointConv variable is a class. Users can use it to create a sub-class to overrid
 14. [CMU:](https://arxiv.org/pdf/2010.16085.pdf) Correspondence Matrices are Underrated
 15. [MaskNet:](https://arxiv.org/pdf/2010.09185.pdf) A Fully-Convolutional Network to Estimate Inlier Points
 16. [MaskNet++:](https://www.sciencedirect.com/science/article/abs/pii/S0097849322000085) Inlier/outlier identification for two point clouds
+17. [CurveNet:](https://github.com/tiangexiang/CurveNet) Walk in the Cloud: Learning Curves for Point Clouds Shape Analysis

learning3d-0.2.0.dist-info/RECORD

@@ -0,0 +1,70 @@
+data_utils/__init__.py,sha256=iYAVh0FThnVlG42QIgmDYrC3NGVYuzKX8s1oRqAI1YU,261
+data_utils/dataloaders.py,sha256=kb0wsLlMN7sB-CS_4BGSprSaZBwkUNYxS5iwUdD6JJM,14871
+data_utils/user_data.py,sha256=ADDGeCUCr6TcXhcxvAFncIeLO71xoRHYi4H418ktvQs,4828
+examples/test_curvenet.py,sha256=Ly-Pp7lhS9kWgyOeCRqlfLrLFOerH76jxb4BWtdPGOA,4085
+examples/test_dcp.py,sha256=-qFgrg5uXdaMR3JF4zxNrmAqZspIgzdKkFFaJPmp-4Y,5626
+examples/test_deepgmr.py,sha256=ux5BjmhtD2kut4zbSkhi6cIMH7BySuVCRKGHqRusEYw,5617
+examples/test_masknet.py,sha256=dkqUui9sv2SzHtvtzUzL_PxJxMcBMqCSDPAYg0BWAVU,6405
+examples/test_masknet2.py,sha256=3_XWBQOwQjK3BCQ__BmPhCvYI_0hZMK3X4C-P2Krw6w,6859
+examples/test_pcn.py,sha256=4eaosjJVqiFxlqnaUWu-O2Jawt4uU16UJEzitIjP2us,4342
+examples/test_pcrnet.py,sha256=_x9l55sMBACXUfQHLaH7GJMfz6PWdYWSxjrRxVoY-As,4366
+examples/test_pnlk.py,sha256=9u7B--PuCpl6TAmObmIKfDvYW6bMj3Jcc3_djTDO-D4,4456
+examples/test_pointconv.py,sha256=NUcLjkkNJsGZYaUZHug6QGybm8NshZfg2tc8rfksNU8,4673
+examples/test_pointnet.py,sha256=VKfB5DE8fh2G1iIoY02GvjSgWUJk2jQBmmJs3HC5rVU,4324
+examples/test_prnet.py,sha256=S8Q7to5NH4Mz39UUzXPmYxaMgiaFZIJBuwlYR2fZByQ,4921
+examples/test_rpmnet.py,sha256=oy-z7I26IQxr4TD_p0qCRnOn6H8VbQFyiWO83ZSFcDk,4476
+examples/train_PointNetLK.py,sha256=0GgT2NYKNZl8o02rvW-nYBO_1tlfDNuakuAXtm1V16c,8773
+examples/train_dcp.py,sha256=SQVrwnZqGmFCZv_X2tzMysBmv-HI9sllZMWw5zsW3NM,9511
+examples/train_deepgmr.py,sha256=vxdkgfQZPtwuYryR0chegTiLuXOQag8r_ccGJ6qtw7o,9397
+examples/train_masknet.py,sha256=XzgWsmVAm5Lk21mH9qhvNN0um4pI1fYVfsBAV4deSOM,8889
+examples/train_pcn.py,sha256=X7MSYVXwgIMExplua1M9pG20eNhZ_0p83yTADSYrAlA,7542
+examples/train_pcrnet.py,sha256=KQ8MiDUiR46qS9t7tc5POJ3NjMyZFBEPOVQY-7Vszpk,8198
+examples/train_pointconv.py,sha256=noGT2yGWHAuecObz1X9cEiWl0xjh7NhmRneP88jR8uI,8939
+examples/train_pointnet.py,sha256=SXheDRP_GHZQQw4BEYS7bfL481D8GcbTekON-GVwOsk,8840
+examples/train_prnet.py,sha256=2zvd-3cYzZP8L92XJmFL5rTzxpApUhetiEc4u4V0X5g,8373
+examples/train_rpmnet.py,sha256=PEdFgPXyeME0axvLEd--VbpbqWV6P5i6NnjQnJ_X3Oo,8530
+losses/__init__.py,sha256=zjjZeA_NvAhZlxiYBbtgjEsvMyLFhFWXlZioitrlGWw,425
+losses/chamfer_distance.py,sha256=UTZ6x5cGwL3L5hJZOWoC35gTzcKh1S0yCg8vGuGXU1w,2121
+losses/classification.py,sha256=QgDHC5VgSga6BiuD4Ee70t6vvchlE97BY0KExevhdgk,374
+losses/correspondence_loss.py,sha256=Tcq2o5eLY7j50pibAuH0vBcUTjwZ-wHNzGZD4H6mAe0,583
+losses/emd.py,sha256=DqP77dN6lPkpGGgBz10oO6YNYxt889weYbVYj6bZFUM,389
+losses/frobenius_norm.py,sha256=IuKr0DT9aPBlc5fjIy6lJ082yOh9F8xiNoXF6FvWZtY,682
+losses/rmse_features.py,sha256=_KMqIWqH9-lH2P6YSeGfSOIbP7plUAwWWBh2Cu7cpXA,453
+models/__init__.py,sha256=1MosMXTuwQDQ6El5o1vIrnfnfRlDvBSLc0JeMoJMFbw,673
+models/classifier.py,sha256=_LUNXbLrpKNXmCkO2R1mz64dbwfrze7f_4SYT1Z6SYo,1205
+models/curvenet.py,sha256=yHGjTwPYkCGMCL1BPZ0t2NPQNh6kxairyJEBbjhjjEk,5461
+models/dcp.py,sha256=LZFgtk9f9f9s3QvX65nFXGgC33yGIZuy4XjviwH8OGE,3377
+models/deepgmr.py,sha256=vIxOQrZjvOCHLElJCjZ8EcZ-vm0-v71IKsPGuSF-elE,5298
+models/dgcnn.py,sha256=Z_5My91H8pcG0HGF75DSI3svbsZ6-ASV-0xx8UrdEt8,1989
+models/masknet.py,sha256=ElMF3b-JgYmgwSEf1taGQvhA7Xy7_MiHEofzc03VCd8,2705
+models/masknet2.py,sha256=6lgukurfzUOY-6xdCpMljOYFtvADLSczAXJzRC3Jkh4,9063
+models/pcn.py,sha256=FvpjLR6t3kFQ1I4Fhpbsaj_P8Ml6S912x36JAZ1dUKs,5346
+models/pcrnet.py,sha256=6C6iM3XkDNdgihtPIdy09RgFD2KKDCnDzLvFfp6X-Tg,2755
+models/pointconv.py,sha256=lJ3_3uslE29lO3roZiE5vxr5971AWV5ExeVTzbEl858,5151
+models/pointnet.py,sha256=qgSWLJ4N5Y7ObAwKiJH29Pcl67jm3sfqbXqi3tQbUQg,3238
+models/pointnetlk.py,sha256=Zl66LjDX1vLdZRgCdY2oQJnpWpqPEx6BH8GbcVCsw68,5805
+models/pooling.py,sha256=vOzJMambeG7kf1pnox5p5FE2CVH2iMDGU_DgWRw15WQ,412
+models/ppfnet.py,sha256=aBzWvtNHFo-eu1kWoZmPI9xJOFHyxYHjdapb6cN2Aso,2894
+models/prnet.py,sha256=MxhoSM8xPlwL4CSFKhDDJAx08-U1Dfzkoh1T0wHygHg,17493
+models/rpmnet.py,sha256=eMVqJ6BalY96TSB8VFXjCJIA15J0XAB3BEpMB-6CMdM,11517
+models/segmentation.py,sha256=CjlINj5M0Y6C-CejrieIu9ZkuwEoCFNjq_hr5SX9umU,1166
+ops/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ops/data_utils.py,sha256=qW8FOQWgcHjuuiSaAayJ3nKJnDW_GDv3ujE-uFvWsPE,1764
+ops/invmat.py,sha256=m1Mm2mQNn4KgQv54w-ek0xLkZuKnfDlF2ooylXeXvAw,4154
+ops/quaternion.py,sha256=D00IL6VHitYy4CINFAilD0t0kyBjc_JHfKuMrJGJ1Cw,6793
+ops/se3.py,sha256=x6oLbQzLOXiM0xDJsVUCUE1liZ_TaJzkkHQvIyjqCqI,3957
+ops/sinc.py,sha256=A_Ffu07RXGx3daZn4zOGdnW10_l06cmhFdAiU4NKhcw,5228
+ops/so3.py,sha256=b0tX5nHyF2Qtp8V0ejGKaPaHJQ_G38ifQ7gSJzRU1ts,5166
+ops/transform_functions.py,sha256=hvNjZO-uJodsGYtQwtAtDxtQ6uBpA7Lv9t-_yAg6wxo,12806
+utils/__init__.py,sha256=QCalqFqrdSWsu2_fZXJoIARv1uI2GiUx8MVtZ8PoiRw,650
+utils/curvenet_util.py,sha256=dcOreJBJddptH_COJkKGlfQnnoHPAnKlnUdA8sQg3GI,19527
+utils/model_common_utils.py,sha256=05cWF97LJBat8rKKVbihb5DgaC_mMv5uY5yOVzH4Dx0,5320
+utils/pointconv_util.py,sha256=kJxGztai7X15YsGuorMOc50SPtj_k1yfkP4XCTzIWdM,14331
+utils/ppfnet_util.py,sha256=HEoxkgUBlawKZLWspfQm3caWUyAMIrW-ECtStNYbe2Y,7989
+utils/svd.py,sha256=yCYQt2SKqeIzCBnBEr_8xFR79m4fIoNVFnp77epn1dM,1936
+utils/transformer.py,sha256=UDgJvnh7ekWyijaAn-a3ckeFeMxlK_chXzWlhAGDiPM,8974
+learning3d-0.2.0.dist-info/LICENSE,sha256=3qY3_NeQIvalbLlsHFtOfuUKjs_U2k6u7rf6YVx6ac0,1098
+learning3d-0.2.0.dist-info/METADATA,sha256=QFrlYdTQ9UEEdKwDnAf8mk8kc80qegmwWYbpYaXJXRQ,18079
+learning3d-0.2.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+learning3d-0.2.0.dist-info/top_level.txt,sha256=80jcwB70RZ4Xr5DiY8ngxdX9YTRT7b7YvApYsqoGHak,44
+learning3d-0.2.0.dist-info/RECORD,,

{learning3d-0.1.0.dist-info → learning3d-0.2.0.dist-info}/WHEEL

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

learning3d-0.2.0.dist-info/top_level.txt

@@ -0,0 +1,6 @@
+data_utils
+examples
+losses
+models
+ops
+utils

{learning3d/models → models}/__init__.py

@@ -15,4 +15,10 @@ from .rpmnet import RPMNet
 from .pcn import PCN
 from .deepgmr import DeepGMR
 from .masknet import MaskNet
-from .masknet2 import MaskNet2
+from .masknet2 import MaskNet2
+from .curvenet import CurveNet
+
+try:
+	from .flownet3d import FlowNet3D
+except:
+	print("Error raised in pointnet2 module for FlowNet3D Network!\nEither don't use pointnet2_utils or retry it's setup.")

models/curvenet.py

@@ -0,0 +1,130 @@
+"""
+@Author: Tiange Xiang
+@Contact: txia7609@uni.sydney.edu.au
+@File: curvenet_cls.py
+@Time: 2021/01/21 3:10 PM
+"""
+
+import torch
+import torch.nn as nn
+import torch.nn.functional as F
+from .. utils import (
+    index_points, 
+    farthest_point_sample, 
+    query_ball_point,
+    LPFA,
+    CIC
+)
+
+def sample_and_group(npoint, radius, nsample, xyz, points, returnfps=False):
+    """
+    Input:
+        npoint:
+        radius:
+        nsample:
+        xyz: input points position data, [B, N, 3]
+        points: input points data, [B, N, D]
+    Return:
+        new_xyz: sampled points position data, [B, npoint, nsample, 3]
+        new_points: sampled points data, [B, npoint, nsample, 3+D]
+    """
+    new_xyz = index_points(xyz, farthest_point_sample(xyz, npoint))
+    torch.cuda.empty_cache()
+
+    idx = query_ball_point(radius, nsample, xyz, new_xyz)
+    torch.cuda.empty_cache()
+
+    new_points = index_points(points, idx)
+    torch.cuda.empty_cache()
+
+    if returnfps:
+        return new_xyz, new_points, idx
+    else:
+        return new_xyz, new_points
+
+curve_config = {
+        'default': [[100, 5], [100, 5], None, None],
+        'long':  [[10, 30], None,  None,  None]
+    }
+
+class CurveNet(nn.Module):
+    def __init__(self, num_classes=40, k=20, setting='default', input_shape="bnc", emb_dims=2048, classifier=True):
+        super(CurveNet, self).__init__()
+
+        if input_shape not in ["bcn", "bnc"]:
+            raise ValueError("Allowed shapes are 'bcn' (batch * channels * num_in_points), 'bnc' ")
+        
+        self.input_shape = input_shape
+
+        assert setting in curve_config
+
+        additional_channel = 32
+        self.classifier = classifier
+        self.lpfa = LPFA(9, additional_channel, k=k, mlp_num=1, initial=True)
+
+        # encoder
+        self.cic11 = CIC(npoint=1024, radius=0.05, k=k, in_channels=additional_channel, output_channels=64, bottleneck_ratio=2, mlp_num=1, curve_config=curve_config[setting][0])
+        self.cic12 = CIC(npoint=1024, radius=0.05, k=k, in_channels=64, output_channels=64, bottleneck_ratio=4, mlp_num=1, curve_config=curve_config[setting][0])
+        
+        self.cic21 = CIC(npoint=1024, radius=0.05, k=k, in_channels=64, output_channels=128, bottleneck_ratio=2, mlp_num=1, curve_config=curve_config[setting][1])
+        self.cic22 = CIC(npoint=1024, radius=0.1, k=k, in_channels=128, output_channels=128, bottleneck_ratio=4, mlp_num=1, curve_config=curve_config[setting][1])
+
+        self.cic31 = CIC(npoint=256, radius=0.1, k=k, in_channels=128, output_channels=256, bottleneck_ratio=2, mlp_num=1, curve_config=curve_config[setting][2])
+        self.cic32 = CIC(npoint=256, radius=0.2, k=k, in_channels=256, output_channels=256, bottleneck_ratio=4, mlp_num=1, curve_config=curve_config[setting][2])
+
+        self.cic41 = CIC(npoint=64, radius=0.2, k=k, in_channels=256, output_channels=512, bottleneck_ratio=2, mlp_num=1, curve_config=curve_config[setting][3])
+        self.cic42 = CIC(npoint=64, radius=0.4, k=k, in_channels=512, output_channels=512, bottleneck_ratio=4, mlp_num=1, curve_config=curve_config[setting][3])
+
+        self.conv0 = nn.Sequential(
+            nn.Conv1d(512, emb_dims//2, kernel_size=1, bias=False),
+            nn.BatchNorm1d(emb_dims//2),
+            nn.ReLU(inplace=True))
+        
+        if self.classifier:
+            self.conv1 = nn.Linear(emb_dims, 512, bias=False)
+            self.conv2 = nn.Linear(512, num_classes)
+            self.bn1 = nn.BatchNorm1d(512)
+            self.dp1 = nn.Dropout(p=0.5)
+
+    def forward(self, xyz, get_flatten_curve_idxs=False):
+        flatten_curve_idxs = {}
+        if self.input_shape == 'bnc':
+            xyz = xyz.permute(0, 2, 1)
+
+        l0_points = self.lpfa(xyz, xyz)
+
+        l1_xyz, l1_points, flatten_curve_idxs_11 = self.cic11(xyz, l0_points)
+        flatten_curve_idxs['flatten_curve_idxs_11'] = flatten_curve_idxs_11
+        l1_xyz, l1_points, flatten_curve_idxs_12 = self.cic12(l1_xyz, l1_points)
+        flatten_curve_idxs['flatten_curve_idxs_12'] = flatten_curve_idxs_12
+
+        l2_xyz, l2_points, flatten_curve_idxs_21 = self.cic21(l1_xyz, l1_points)
+        flatten_curve_idxs['flatten_curve_idxs_21'] = flatten_curve_idxs_21
+        l2_xyz, l2_points, flatten_curve_idxs_22 = self.cic22(l2_xyz, l2_points)
+        flatten_curve_idxs['flatten_curve_idxs_22'] = flatten_curve_idxs_22
+
+        l3_xyz, l3_points, flatten_curve_idxs_31 = self.cic31(l2_xyz, l2_points)
+        flatten_curve_idxs['flatten_curve_idxs_31'] = flatten_curve_idxs_31
+        l3_xyz, l3_points, flatten_curve_idxs_32 = self.cic32(l3_xyz, l3_points)
+        flatten_curve_idxs['flatten_curve_idxs_32'] = flatten_curve_idxs_32
+ 
+        l4_xyz, l4_points, flatten_curve_idxs_41 = self.cic41(l3_xyz, l3_points)
+        flatten_curve_idxs['flatten_curve_idxs_41'] = flatten_curve_idxs_41
+        l4_xyz, l4_points, flatten_curve_idxs_42 = self.cic42(l4_xyz, l4_points)
+        flatten_curve_idxs['flatten_curve_idxs_42'] = flatten_curve_idxs_42
+
+        x = self.conv0(l4_points)
+        x_max = F.adaptive_max_pool1d(x, 1)
+        x_avg = F.adaptive_avg_pool1d(x, 1)
+        
+        x = torch.cat((x_max, x_avg), dim=1).squeeze(-1)
+
+        if self.classifier:
+            x = F.relu(self.bn1(self.conv1(x).unsqueeze(-1)), inplace=True).squeeze(-1)
+            x = self.dp1(x)
+            x = self.conv2(x)
+        
+        if get_flatten_curve_idxs:
+            return x, flatten_curve_idxs
+        else:
+            return x

{learning3d/models → models}/dgcnn.py

@@ -1,40 +1,6 @@
 import torch
 import torch.nn.functional as F
-
-def knn(x, k):
-	inner = -2 * torch.matmul(x.transpose(2, 1).contiguous(), x)
-	xx = torch.sum(x ** 2, dim=1, keepdim=True)
-	pairwise_distance = -xx - inner - xx.transpose(2, 1).contiguous()
-
-	idx = pairwise_distance.topk(k=k, dim=-1)[1]  # (batch_size, num_points, k)
-	return idx
-
-
-def get_graph_feature(x, k=20):
-	# x = x.squeeze()
-	idx = knn(x, k=k)  # (batch_size, num_points, k)
-	batch_size, num_points, _ = idx.size()
-	
-	device = torch.device("cuda") if torch.cuda.is_available() else torch.device("cpu")
-
-	idx_base = torch.arange(0, batch_size, device=device).view(-1, 1, 1) * num_points
-
-	idx = idx + idx_base
-
-	idx = idx.view(-1)
-
-	_, num_dims, _ = x.size()
-
-	# (batch_size, num_points, num_dims)  -> (batch_size*num_points, num_dims) #   batch_size * num_points * k + range(0, batch_size*num_points)
-	x = x.transpose(2, 1).contiguous()  
-
-	feature = x.view(batch_size * num_points, -1)[idx, :]
-	feature = feature.view(batch_size, num_points, k, num_dims)
-	x = x.view(batch_size, num_points, 1, num_dims).repeat(1, 1, k, 1)
-
-	feature = torch.cat((feature, x), dim=3).permute(0, 3, 1, 2)
-
-	return feature
+from .. utils import knn, get_graph_feature
 
 
 class DGCNN(torch.nn.Module):

{learning3d/models → models}/prnet.py

@@ -16,7 +16,7 @@ import torch.nn as nn
 import torch.nn.functional as F
 
 from .. ops import transform_functions as transform
-from .. utils import Transformer, Identity
+from .. utils import Transformer, Identity, knn, get_graph_feature
 
 from sklearn.metrics import r2_score
 
@@ -30,40 +30,6 @@ def pairwise_distance(src, tgt):
     distances = xx.transpose(2, 1).contiguous() + inner + yy
     return torch.sqrt(distances)
 
-
-def knn(x, k):
-    inner = -2 * torch.matmul(x.transpose(2, 1).contiguous(), x)
-    xx = torch.sum(x ** 2, dim=1, keepdim=True)
-    distance = -xx - inner - xx.transpose(2, 1).contiguous()
-
-    idx = distance.topk(k=k, dim=-1)[1]  # (batch_size, num_points, k)
-    return idx
-
-
-def get_graph_feature(x, k=20):
-    # x = x.squeeze()
-    x = x.view(*x.size()[:3])
-    idx = knn(x, k=k)  # (batch_size, num_points, k)
-    batch_size, num_points, _ = idx.size()
-
-    idx_base = torch.arange(0, batch_size, device=device).view(-1, 1, 1) * num_points
-
-    idx = idx + idx_base
-
-    idx = idx.view(-1)
-
-    _, num_dims, _ = x.size()
-
-    x = x.transpose(2, 1).contiguous()  # (batch_size, num_points, num_dims)  -> (batch_size*num_points, num_dims) #   batch_size * num_points * k + range(0, batch_size*num_points)
-    feature = x.view(batch_size * num_points, -1)[idx, :]
-    feature = feature.view(batch_size, num_points, k, num_dims)
-    x = x.view(batch_size, num_points, 1, num_dims).repeat(1, 1, k, 1)
-
-    feature = torch.cat((feature, x), dim=3).permute(0, 3, 1, 2)
-
-    return feature
-
-
 def cycle_consistency(rotation_ab, translation_ab, rotation_ba, translation_ba):
     batch_size = rotation_ab.size(0)
     identity = torch.eye(3, device=rotation_ab.device).unsqueeze(0).repeat(batch_size, 1, 1)
@@ -109,19 +75,19 @@ class DGCNN(nn.Module):
 
     def forward(self, x):
         batch_size, num_dims, num_points = x.size()
-        x = get_graph_feature(x)
+        x = get_graph_feature(x, device=device)
         x = F.leaky_relu(self.bn1(self.conv1(x)), negative_slope=0.2)
         x1 = x.max(dim=-1, keepdim=True)[0]
  
-        x = get_graph_feature(x1)
+        x = get_graph_feature(x1, device=device)
         x = F.leaky_relu(self.bn2(self.conv2(x)), negative_slope=0.2)
         x2 = x.max(dim=-1, keepdim=True)[0]
 
-        x = get_graph_feature(x2)
+        x = get_graph_feature(x2, device=device)
         x = F.leaky_relu(self.bn3(self.conv3(x)), negative_slope=0.2)
         x3 = x.max(dim=-1, keepdim=True)[0]
 
-        x = get_graph_feature(x3)
+        x = get_graph_feature(x3, device=device)
         x = F.leaky_relu(self.bn4(self.conv4(x)), negative_slope=0.2)
         x4 = x.max(dim=-1, keepdim=True)[0]
 

utils/__init__.py

@@ -0,0 +1,23 @@
+from .svd import SVDHead
+from .transformer import Transformer, Identity
+from .ppfnet_util import angle_difference, square_distance, index_points, farthest_point_sample, query_ball_point, sample_and_group, sample_and_group_multi
+from .pointconv_util import PointConvDensitySetAbstraction
+from .model_common_utils import (
+	knn,
+	pc_normalize,
+	square_distance,
+	index_points,
+	farthest_point_sample,
+	knn_point,
+	query_ball_point,
+	get_graph_feature
+)
+from .curvenet_util import (
+	LPFA,
+	CIC,
+)
+
+try:
+	from .lib import pointnet2_utils
+except:
+	print("Error raised in pointnet2 module in utils!\nEither don't use pointnet2_utils or retry it's setup.")