Merge pull request #7 from torch-points3d/datasets

Datasets

Author: clee-ai

conf/config.yaml

@@ -1,19 +1,12 @@
-defaults:
-  - task: ???
-  - models: ???
-  - data: ???
+defaults: # loads default configs
+  - dataset: ???
+  - optimizer: sgd
+  - scheduler: default
+  - model: ???
   - training: default
   - trainer: default
 
-job_name: benchmark
-model_name: ???
-update_lr_scheduler_on: "on_epoch" # ["on_epoch", "on_num_batch", "on_num_sample"]
-selection_stage: ""
-pretty_print: False
-eval_frequency: 1
-
-tracker_options:
-  # Extra options for the tracker
-  full_res: False
-  make_submission: False
-  track_boxes: False
+experiment_name: ${now:%Y-%m-%d}_${now:%H-%M-%S}
+log: False
+ignore_warnings: True # todo: check warnings before release
+pretty_print: True

conf/data/default.yaml

@@ -0,0 +1,17 @@
+# @package dataset
+# cfg:
+  # torch data-loader specific arguments
+cfg: 
+  batch_size: ${training.batch_size}
+  num_workers: ${training.num_workers}
+  dataroot: data
+
+  common_transform:
+  aug_transform:
+  pre_transform:
+
+  val_transform: "${dataset.cfg.common_transform}"
+  test_transform: "${dataset.cfg.val_transform}"
+  train_transform: 
+    - "${dataset.cfg.aug_transform}"
+    - "${dataset.cfg.common_transform}"

conf/data/segmentation/s3dis/s3dis1x1.yaml

@@ -0,0 +1,6 @@
+# @package dataset
+defaults:
+  - segmentation/default
+_target_: torch_points3d.datasets.s3dis1x1.s3dis_data_module
+cfg:
+  fold: 5

conf/dataset/default.yaml

@@ -0,0 +1,6 @@
+# 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}

conf/data/segmentation/default.yaml renamed to conf/dataset/segmentation/default.yaml

@@ -1,4 +1,4 @@
 _target_: torch.optim.SGD
-lr: ${training.optim.base_lr}
+lr: ${training.lr}
 momentum: 0.9
 weight_decay: 0.0005