update to add more model seperation

Author: clee-ai

conf/dataset/default.yaml

@@ -2,6 +2,8 @@
 # cfg:
   # torch data-loader specific arguments
 cfg: 
+  num_classes: 
+  feature_dimension: 
   batch_size: ${training.batch_size}
   num_workers: ${training.num_workers}
   dataroot: data

conf/dataset/segmentation/s3dis/s3dis1x1.yaml

@@ -3,4 +3,6 @@ defaults:
   - segmentation/default
 _target_: torch_points3d.datasets.s3dis1x1.s3dis_data_module
 cfg:
+  num_classes: 13
+  feature_dimension: 6 # todo: able to calculate this dynamically
   fold: 5

conf/model/default.yaml

@@ -5,4 +5,4 @@ defaults:
 # By default we turn off recursive instantiation, allowing the user to instantiate themselves at the appropriate times.
 _recursive_: false
 
-_target_: torch_points3d.models.base_model.PointCloudBaseModel
+_target_: torch_points3d.tasks.base_model.PointCloudBaseModule

conf/model/segmentation/default.yaml

@@ -2,7 +2,11 @@
 defaults:
   - /model/default
 
-_target_: torch_points3d.models.segmentation.base_model.SegmentationBaseModel
+model:
+  _recursive_: false
+  _target_: torch_points3d.models.segmentation.base_model.SegmentationBaseModel
+  num_classes: ${dataset.cfg.num_classes}
 
-backbone:
-  architecture: unet
+  backbone:
+    input_nc: ${dataset.cfg.feature_dimension}
+    architecture: unet

conf/model/segmentation/sparseconv3d/Res16UNet34.yaml

@@ -2,8 +2,9 @@
 defaults:
   - /model/segmentation/ResUNet32
 
-backbone:
-  down_conv:
-    N: [ 0, 2, 3, 4, 6 ]
-  up_conv:
-    N: [ 1, 1, 1, 1, 1 ]
+model: 
+  backbone:
+    down_conv:
+      N: [ 0, 2, 3, 4, 6 ]
+    up_conv:
+      N: [ 1, 1, 1, 1, 1 ]

conf/model/segmentation/sparseconv3d/ResUNet32.yaml

@@ -2,39 +2,40 @@
 defaults:
   - /model/segmentation/default
 
-backbone:
-  _target_: torch_points3d.applications.sparseconv3d.SparseConv3d
-  backend: torchsparse
+model: 
+  backbone:
+    _target_: torch_points3d.applications.sparseconv3d.SparseConv3d
+    backend: torchsparse
 
-  config:
-    define_constants:
-      in_feat: 32
-      block: ResBlock # Can be any of the blocks in modules/MinkowskiEngine/api_modules.py
-    down_conv:
-      module_name: ResNetDown
-      block: block
-      N: [ 0, 1, 2, 2, 3 ]
-      down_conv_nn:
-        [
-          [ FEAT, in_feat ],
-          [ in_feat, in_feat ],
-          [ in_feat, 2*in_feat ],
-          [ 2*in_feat, 4*in_feat ],
-          [ 4*in_feat, 8*in_feat ],
-        ]
-      kernel_size: 3
-      stride: [ 1, 2, 2, 2, 2 ]
-    up_conv:
-      block: block
-      module_name: ResNetUp
-      N: [ 1, 1, 1, 1, 0 ]
-      up_conv_nn:
-        [
-          [ 8*in_feat, 4*in_feat ],
-          [ 4*in_feat + 4*in_feat, 4*in_feat ],
-          [ 4*in_feat + 2*in_feat, 3*in_feat ],
-          [ 3*in_feat + in_feat, 3*in_feat ],
-          [ 3*in_feat + in_feat, 3*in_feat ],
-        ]
-      kernel_size: 3
-      stride: [ 2, 2, 2, 2, 1 ]
+    config:
+      define_constants:
+        in_feat: 32
+        block: ResBlock # Can be any of the blocks in modules/MinkowskiEngine/api_modules.py
+      down_conv:
+        module_name: ResNetDown
+        block: block
+        N: [ 0, 1, 2, 2, 3 ]
+        down_conv_nn:
+          [
+            [ FEAT, in_feat ],
+            [ in_feat, in_feat ],
+            [ in_feat, 2*in_feat ],
+            [ 2*in_feat, 4*in_feat ],
+            [ 4*in_feat, 8*in_feat ],
+          ]
+        kernel_size: 3
+        stride: [ 1, 2, 2, 2, 2 ]
+      up_conv:
+        block: block
+        module_name: ResNetUp
+        N: [ 1, 1, 1, 1, 0 ]
+        up_conv_nn:
+          [
+            [ 8*in_feat, 4*in_feat ],
+            [ 4*in_feat + 4*in_feat, 4*in_feat ],
+            [ 4*in_feat + 2*in_feat, 3*in_feat ],
+            [ 3*in_feat + in_feat, 3*in_feat ],
+            [ 3*in_feat + in_feat, 3*in_feat ],
+          ]
+        kernel_size: 3
+        stride: [ 2, 2, 2, 2, 1 ]

torch_points3d/models/base_architectures/__init__.py renamed to torch_points3d/applications/base_architectures/__init__.py

@@ -13,7 +13,7 @@
     BatchNorm1d as BN,
     Dropout,
 )
-from torch_points3d.models.base_architectures.base_model import BaseModel
+from torch_points3d.applications.base_architectures.base_model import BaseModel
 from omegaconf.listconfig import ListConfig
 from omegaconf.dictconfig import DictConfig
 import logging