clean code

Wuziyi616 · Oct 3, 2022 · bad9621 · bad9621
1 parent 00a927d
commit bad9621
Show file tree

Hide file tree

Showing 49 changed files with 246 additions and 1,566 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+data/
 example_data/
 checkpoint/
 wandb/

diff --git a/README.md b/README.md
@@ -37,6 +37,11 @@ You can train, test and visualize the results using our provided config files, o
 We explain our code design in [tutorial.md](docs/tutorial.md).
 Please read it before modifying the codebase or implementing your new algorithms.
 
+## Benchmark
+
+We benchmark the baselines and report them in [model.md](docs/model.md).
+We also present detailed instructions on how to reproduce our results.
+
 ## License
 
 This project is released under the [MIT license](LICENSE).

diff --git a/configs/_base_/datasets/breaking_bad/artifact.py b/configs/_base_/datasets/breaking_bad/artifact.py
@@ -4,7 +4,7 @@
 
 _C = CN()
 _C.dataset = 'geometry'
-_C.data_dir = '/scratch/ssd004/scratch/ziyiwu/data/assembly'
+_C.data_dir = './data/breaking_bad'
 _C.data_fn = 'artifact.{}.txt'
 _C.data_keys = ('part_ids', )
 _C.category = ''  # empty means all categories

diff --git a/configs/_base_/datasets/breaking_bad/everyday.py b/configs/_base_/datasets/breaking_bad/everyday.py
@@ -4,7 +4,7 @@
 
 _C = CN()
 _C.dataset = 'geometry'
-_C.data_dir = '/scratch/ssd004/scratch/ziyiwu/data/assembly'
+_C.data_dir = './data/breaking_bad'
 _C.data_fn = 'everyday.{}.txt'
 _C.data_keys = ('part_ids', )
 _C.category = ''  # empty means all categories

diff --git a/configs/_base_/datasets/breaking_bad/other.py b/configs/_base_/datasets/breaking_bad/other.py
@@ -4,7 +4,7 @@
 
 _C = CN()
 _C.dataset = 'geometry'
-_C.data_dir = '/scratch/ssd004/scratch/ziyiwu/data/assembly'
+_C.data_dir = './data/breaking_bad'
 _C.data_fn = 'other.{}.txt'
 _C.data_keys = ('part_ids', )
 _C.category = ''  # empty means all categories

diff --git a/configs/_base_/datasets/partnet/partnet_chair.py b/configs/_base_/datasets/partnet/partnet_chair.py
@@ -4,7 +4,7 @@
 
 _C = CN()
 _C.dataset = 'partnet'
-_C.data_dir = '../Generative-3D-Part-Assembly/prepare_data'
+_C.data_dir = './data/partnet'
 _C.data_fn = 'Chair.{}.npy'
 _C.category = 'Chair'  # actually useless
 _C.data_keys = ('part_ids', 'match_ids', 'contact_points')

diff --git a/configs/_base_/datasets/partnet/partnet_lamp.py b/configs/_base_/datasets/partnet/partnet_lamp.py
@@ -4,7 +4,7 @@
 
 _C = CN()
 _C.dataset = 'partnet'
-_C.data_dir = '../Generative-3D-Part-Assembly/prepare_data'
+_C.data_dir = './data/partnet'
 _C.data_fn = 'Lamp.{}.npy'
 _C.category = 'Lamp'  # actually useless
 _C.data_keys = ('part_ids', 'match_ids', 'contact_points')

diff --git a/configs/_base_/datasets/partnet/partnet_table.py b/configs/_base_/datasets/partnet/partnet_table.py
@@ -4,7 +4,7 @@
 
 _C = CN()
 _C.dataset = 'partnet'
-_C.data_dir = '../Generative-3D-Part-Assembly/prepare_data'
+_C.data_dir = './data/partnet'
 _C.data_fn = 'Table.{}.npy'
 _C.category = 'Table'  # actually useless
 _C.data_keys = ('part_ids', 'match_ids', 'contact_points')

diff --git a/configs/_base_/models/loss/geometric_loss.py b/configs/_base_/models/loss/geometric_loss.py
@@ -15,7 +15,6 @@
 #       also note that there is almost no symmetry in this dataset
 _C = CN()
 _C.noise_dim = 0  # no stochastic
-_C.num_rot = 1  # rotate GT to match the predictions
 
 _C.trans_loss_w = 1.
 _C.rot_pt_cd_loss_w = 10.

diff --git a/configs/_base_/models/pn_transformer/pn_transformer_gan.py b/configs/_base_/models/pn_transformer/pn_transformer_gan.py
diff --git a/configs/_base_/models/pn_transformer/vn_pn_transformer.py b/configs/_base_/models/pn_transformer/vn_pn_transformer.py
diff --git a/configs/_base_/models/pn_transformer/vn_pn_transformer_v2.py b/configs/_base_/models/pn_transformer/vn_pn_transformer_v2.py
diff --git a/configs/dgl/dgl-32x1-cosine_200e-artifact.py b/configs/dgl/dgl-32x1-cosine_200e-artifact.py
@@ -20,7 +20,7 @@
 _C.exp.val_every = 5  # DGL training is very slow
 
 _C.data = CN()
-_C.data.data_keys = ('part_ids', 'instance_label', 'valid_matrix')
+_C.data.data_keys = ('part_ids', 'valid_matrix')
 
 
 def get_cfg_defaults():

diff --git a/configs/pn_transformer/pn_transformer_gan/pn_transformer_gan-32x1-cosine_400e-artifact.py b/configs/pn_transformer/pn_transformer_gan/pn_transformer_gan-32x1-cosine_400e-artifact.py
diff --git a/configs/pn_transformer/pn_transformer_gan/pn_transformer_gan-32x1-cosine_400e-everyday.py b/configs/pn_transformer/pn_transformer_gan/pn_transformer_gan-32x1-cosine_400e-everyday.py
diff --git a/...gs/pn_transformer/pn_transformer_gan/pn_transformer_gan-32x1-cosine_400e-partnet_chair.py b/...gs/pn_transformer/pn_transformer_gan/pn_transformer_gan-32x1-cosine_400e-partnet_chair.py
diff --git a/configs/pn_transformer/vn_pn_transformer/vn_pn_transformer-6x1-cosine_400e-artifact.py b/configs/pn_transformer/vn_pn_transformer/vn_pn_transformer-6x1-cosine_400e-artifact.py
diff --git a/configs/pn_transformer/vn_pn_transformer/vn_pn_transformer-6x1-cosine_400e-everyday.py b/configs/pn_transformer/vn_pn_transformer/vn_pn_transformer-6x1-cosine_400e-everyday.py
diff --git a/configs/pn_transformer/vn_pn_transformer_v2/vn_pn_transformer_v2-6x1-cosine_400e-everyday.py b/configs/pn_transformer/vn_pn_transformer_v2/vn_pn_transformer_v2-6x1-cosine_400e-everyday.py
diff --git a/configs/rgl_net/rgl_net-32x1-cosine_200e-artifact.py b/configs/rgl_net/rgl_net-32x1-cosine_200e-artifact.py
@@ -17,7 +17,7 @@
 _C.exp.val_every = 5  # to be the same as DGL
 
 _C.data = CN()
-_C.data.data_keys = ('part_ids', 'instance_label', 'valid_matrix')
+_C.data.data_keys = ('part_ids', 'valid_matrix')
 
 
 def get_cfg_defaults():

diff --git a/docs/install.md b/docs/install.md
@@ -11,6 +11,8 @@ conda create -n assembly python=3.8
 conda activate assembly
 # pytorch
 conda install pytorch=1.10 torchvision torchaudio cudatoolkit=11.3 -c pytorch
+# pytorch-lightning
+conda install pytorch-lightning=1.6.2
 # pytorch3d
 conda install -c fvcore -c iopath -c conda-forge fvcore iopath
 conda install pytorch3d -c pytorch3d