Merge pull request #10 from torch-points3d/model-dataset

working training

Author: clee-ai

conf/config.yaml

@@ -1,7 +1,5 @@
 defaults: # loads default configs
   - dataset: ???
-  - optimizer: sgd
-  - scheduler: default
   - model: ???
   - training: default
   - trainer: default

conf/dataset/default.yaml

@@ -1,7 +1,6 @@
 # @package dataset
-# cfg:
-  # torch data-loader specific arguments
 cfg: 
+  feature_dimension: 
   batch_size: ${training.batch_size}
   num_workers: ${training.num_workers}
   dataroot: data

conf/dataset/segmentation/default.yaml

@@ -1,3 +1,6 @@
 # @package dataset
 defaults:
-  - /dataset/default
+  - /dataset/default
+
+cfg:
+  num_classes: 

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

@@ -1,6 +1,8 @@
+# @package model
+defaults:
+  - /optimizer: sgd
+  - /scheduler: 
 # 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
-optimizer: ${optimizer}
-scheduler: ${scheduler}
+_target_: torch_points3d.tasks.base_model.PointCloudBaseModule

conf/model/segmentation/default.yaml

@@ -0,0 +1,14 @@
+# @package model
+defaults:
+  - /model/default
+
+model:
+  _recursive_: false
+  _target_: torch_points3d.models.segmentation.base_model.SegmentationBaseModel
+  num_classes: ${dataset.cfg.num_classes}
+  criterion:
+    _target_: torch.nn.NLLLoss
+
+  backbone:
+    input_nc: ${dataset.cfg.feature_dimension}
+    architecture: unet

conf/model/segmentation/sparseconv3d.yaml

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

conf/model/segmentation/sparseconv3d/Res16UNet34.yaml

@@ -0,0 +1,41 @@
+# @package model
+defaults:
+  - /model/segmentation/default
+
+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 ]