diff --git a/datasets/ModelNet40.py b/datasetss/ModelNet40.py
similarity index 99%
rename from datasets/ModelNet40.py
rename to datasetss/ModelNet40.py
index b00630b..1caad81 100644
--- a/datasets/ModelNet40.py
+++ b/datasetss/ModelNet40.py
@@ -35,11 +35,11 @@ from os import listdir
from os.path import exists, join
# Dataset parent class
-from datasets.common import PointCloudDataset
+from datasetss.common import PointCloudDataset
from torch.utils.data import Sampler, get_worker_info
from utils.mayavi_visu import *
-from datasets.common import grid_subsampling
+from datasetss.common import grid_subsampling
from utils.config import bcolors
# ----------------------------------------------------------------------------------------------------------------------
@@ -110,7 +110,7 @@ class ModelNet40Dataset(PointCloudDataset):
self.ignored_labels = np.array([])
# Dataset folder
- self.path = '../../Data/ModelNet40'
+ self.path = './Data/ModelNet40'
# Type of task conducted on this dataset
self.dataset_task = 'classification'
diff --git a/datasets/NPM3D.py b/datasetss/NPM3D.py
similarity index 99%
rename from datasets/NPM3D.py
rename to datasetss/NPM3D.py
index 350834a..87700f3 100644
--- a/datasets/NPM3D.py
+++ b/datasetss/NPM3D.py
@@ -36,11 +36,11 @@ from os import listdir
from os.path import exists, join, isdir
# Dataset parent class
-from datasets.common import PointCloudDataset
+from datasetss.common import PointCloudDataset
from torch.utils.data import Sampler, get_worker_info
from utils.mayavi_visu import *
-from datasets.common import grid_subsampling
+from datasetss.common import grid_subsampling
from utils.config import bcolors
@@ -83,7 +83,7 @@ class NPM3DDataset(PointCloudDataset):
self.ignored_labels = np.array([0])
# Dataset folder
- self.path = '../../Data/Paris'
+ self.path = './Data/Paris'
# Type of task conducted on this dataset
self.dataset_task = 'cloud_segmentation'
diff --git a/datasets/S3DIS.py b/datasetss/S3DIS.py
similarity index 99%
rename from datasets/S3DIS.py
rename to datasetss/S3DIS.py
index 0b4054e..6e1b43f 100644
--- a/datasets/S3DIS.py
+++ b/datasetss/S3DIS.py
@@ -37,11 +37,11 @@ from os import listdir
from os.path import exists, join, isdir
# Dataset parent class
-from datasets.common import PointCloudDataset
+from datasetss.common import PointCloudDataset
from torch.utils.data import Sampler, get_worker_info
from utils.mayavi_visu import *
-from datasets.common import grid_subsampling
+from datasetss.common import grid_subsampling
from utils.config import bcolors
@@ -86,7 +86,7 @@ class S3DISDataset(PointCloudDataset):
self.ignored_labels = np.array([])
# Dataset folder
- self.path = '../../Data/S3DIS'
+ self.path = './Data/S3DIS'
# Type of task conducted on this dataset
self.dataset_task = 'cloud_segmentation'
diff --git a/datasets/SemanticKitti.py b/datasetss/SemanticKitti.py
similarity index 99%
rename from datasets/SemanticKitti.py
rename to datasetss/SemanticKitti.py
index 2f10774..dcc6f46 100644
--- a/datasets/SemanticKitti.py
+++ b/datasetss/SemanticKitti.py
@@ -36,12 +36,12 @@ from os import listdir
from os.path import exists, join, isdir
# Dataset parent class
-from datasets.common import *
+from datasetss.common import *
from torch.utils.data import Sampler, get_worker_info
from utils.mayavi_visu import *
from utils.metrics import fast_confusion
-from datasets.common import grid_subsampling
+from datasetss.common import grid_subsampling
from utils.config import bcolors
@@ -62,7 +62,7 @@ class SemanticKittiDataset(PointCloudDataset):
##########################
# Dataset folder
- self.path = '../../Data/SemanticKitti'
+ self.path = './Data/SemanticKitti'
# Type of task conducted on this dataset
self.dataset_task = 'slam_segmentation'
diff --git a/datasets/common.py b/datasetss/common.py
similarity index 100%
rename from datasets/common.py
rename to datasetss/common.py
diff --git a/doc/object_classification_guide.md b/doc/object_classification_guide.md
index ff600a3..3916573 100644
--- a/doc/object_classification_guide.md
+++ b/doc/object_classification_guide.md
@@ -4,11 +4,11 @@
### Data
We consider our experiment folder is located at `XXXX/Experiments/KPConv-PyTorch`. And we use a common Data folder
-loacated at `XXXX/Data`. Therefore the relative path to the Data folder is `../../Data`.
+loacated at `XXXX/Data`. Therefore the relative path to the Data folder is `./Data`.
Regularly sampled clouds from ModelNet40 dataset can be downloaded
here (1.6 GB).
-Uncompress the data and move it inside the folder `../../Data/ModelNet40`.
+Uncompress the data and move it inside the folder `./Data/ModelNet40`.
N.B. If you want to place your data anywhere else, you just have to change the variable
`self.path` of `ModelNet40Dataset` class ([here](https://github.com/HuguesTHOMAS/KPConv-PyTorch/blob/e9d328135c0a3818ee0cf1bb5bb63434ce15c22e/datasets/ModelNet40.py#L113)).
diff --git a/doc/scene_segmentation_guide.md b/doc/scene_segmentation_guide.md
index acc35fc..30400f0 100644
--- a/doc/scene_segmentation_guide.md
+++ b/doc/scene_segmentation_guide.md
@@ -4,10 +4,10 @@
### Data
We consider our experiment folder is located at `XXXX/Experiments/KPConv-PyTorch`. And we use a common Data folder
-loacated at `XXXX/Data`. Therefore the relative path to the Data folder is `../../Data`.
+loacated at `XXXX/Data`. Therefore the relative path to the Data folder is `./Data`.
S3DIS dataset can be downloaded here (4.8 GB).
-Download the file named `Stanford3dDataset_v1.2.zip`, uncompress the data and move it to `../../Data/S3DIS`.
+Download the file named `Stanford3dDataset_v1.2.zip`, uncompress the data and move it to `./Data/S3DIS`.
N.B. If you want to place your data anywhere else, you just have to change the variable
`self.path` of `S3DISDataset` class ([here](https://github.com/HuguesTHOMAS/KPConv-PyTorch/blob/afa18c92f00c6ed771b61cb08b285d2f93446ea4/datasets/S3DIS.py#L88)).
diff --git a/doc/slam_segmentation_guide.md b/doc/slam_segmentation_guide.md
index be47d75..cf49bd1 100644
--- a/doc/slam_segmentation_guide.md
+++ b/doc/slam_segmentation_guide.md
@@ -4,7 +4,7 @@
### Data
We consider our experiment folder is located at `XXXX/Experiments/KPConv-PyTorch`. And we use a common Data folder
-loacated at `XXXX/Data`. Therefore the relative path to the Data folder is `../../Data`.
+loacated at `XXXX/Data`. Therefore the relative path to the Data folder is `./Data`.
SemanticKitti dataset can be downloaded here (80 GB).
Download the three file named:
@@ -12,13 +12,13 @@ Download the three file named:
* [`data_odometry_calib.zip` (1 MB)](http://www.cvlibs.net/download.php?file=data_odometry_calib.zip)
* [`data_odometry_labels.zip` (179 MB)](http://semantic-kitti.org/assets/data_odometry_labels.zip)
-uncompress the data and move it to `../../Data/SemanticKitti`.
+uncompress the data and move it to `./Data/SemanticKitti`.
You also need to download the files
[`semantic-kitti-all.yaml`](https://github.com/PRBonn/semantic-kitti-api/blob/master/config/semantic-kitti-all.yaml)
and
[`semantic-kitti.yaml`](https://github.com/PRBonn/semantic-kitti-api/blob/master/config/semantic-kitti.yaml).
-Place them in your `../../Data/SemanticKitti` folder.
+Place them in your `./Data/SemanticKitti` folder.
N.B. If you want to place your data anywhere else, you just have to change the variable
`self.path` of `SemanticKittiDataset` class ([here](https://github.com/HuguesTHOMAS/KPConv-PyTorch/blob/c32e6ce94ed34a3dd9584f98d8dc0be02535dfb4/datasets/SemanticKitti.py#L65)).
diff --git a/plot_convergence.py b/plot_convergence.py
index 6b24af6..ee27e7f 100644
--- a/plot_convergence.py
+++ b/plot_convergence.py
@@ -37,9 +37,9 @@ from utils.metrics import IoU_from_confusions, smooth_metrics, fast_confusion
from utils.ply import read_ply
# Datasets
-from datasets.ModelNet40 import ModelNet40Dataset
-from datasets.S3DIS import S3DISDataset
-from datasets.SemanticKitti import SemanticKittiDataset
+from datasetss.ModelNet40 import ModelNet40Dataset
+from datasetss.S3DIS import S3DISDataset
+from datasetss.SemanticKitti import SemanticKittiDataset
# ----------------------------------------------------------------------------------------------------------------------
#
diff --git a/test_models.py b/test_models.py
index 53eac76..63cfdd6 100644
--- a/test_models.py
+++ b/test_models.py
@@ -29,9 +29,9 @@ import sys
import torch
# Dataset
-from datasets.ModelNet40 import *
-from datasets.S3DIS import *
-from datasets.SemanticKitti import *
+from datasetss.ModelNet40 import *
+from datasetss.S3DIS import *
+from datasetss.SemanticKitti import *
from torch.utils.data import DataLoader
from utils.config import Config
@@ -155,6 +155,7 @@ if __name__ == '__main__':
print()
print('Data Preparation')
print('****************')
+ print(config.dataset)
if on_val:
set = 'validation'
diff --git a/train_ModelNet40.py b/train_ModelNet40.py
index feaa048..a00aad7 100644
--- a/train_ModelNet40.py
+++ b/train_ModelNet40.py
@@ -29,7 +29,7 @@ import sys
import torch
# Dataset
-from datasets.ModelNet40 import *
+from datasetss.ModelNet40 import *
from torch.utils.data import DataLoader
from utils.config import Config
diff --git a/train_NPM3D.py b/train_NPM3D.py
index b3f0999..d083a37 100644
--- a/train_NPM3D.py
+++ b/train_NPM3D.py
@@ -26,7 +26,7 @@ import signal
import os
# Dataset
-from datasets.NPM3D import *
+from datasetss.NPM3D import *
from torch.utils.data import DataLoader
from utils.config import Config
diff --git a/train_S3DIS.py b/train_S3DIS.py
index 1373216..8cb54bb 100644
--- a/train_S3DIS.py
+++ b/train_S3DIS.py
@@ -26,7 +26,7 @@ import signal
import os
# Dataset
-from datasets.S3DIS import *
+from datasetss.S3DIS import *
from torch.utils.data import DataLoader
from utils.config import Config
diff --git a/train_SemanticKitti.py b/train_SemanticKitti.py
index cff2f46..7c1dcdb 100644
--- a/train_SemanticKitti.py
+++ b/train_SemanticKitti.py
@@ -29,7 +29,7 @@ import sys
import torch
# Dataset
-from datasets.SemanticKitti import *
+from datasetss.SemanticKitti import *
from torch.utils.data import DataLoader
from utils.config import Config
diff --git a/visualize_deformations.py b/visualize_deformations.py
index a1c73b9..dd05e35 100644
--- a/visualize_deformations.py
+++ b/visualize_deformations.py
@@ -29,8 +29,8 @@ import sys
import torch
# Dataset
-from datasets.ModelNet40 import *
-from datasets.S3DIS import *
+from datasetss.ModelNet40 import *
+from datasetss.S3DIS import *
from torch.utils.data import DataLoader
from utils.config import Config