solve merge

configs/local/train_config.yaml

@@ -84,7 +84,7 @@ module:
   gf_view_finder:
     t_feat_dim: 128
     pose_feat_dim: 256
-    main_feat_dim: 2048
+    main_feat_dim: 3072
     regression_head: Rx_Ry_and_T
     pose_mode: rot_matrix
     per_point_feature: False

configs/server/server_train_config.yaml

@@ -7,7 +7,11 @@ runner:
     parallel: False
     
   experiment:
+<<<<<<< HEAD
     name: test_new_pipeline_train_overfit
+=======
+    name: debug
+>>>>>>> 63a246c0c87d42f04076a459adcfdc88c954b09c
     root_dir: "experiments"
     use_checkpoint: False
     epoch: -1 # -1 stands for last epoch
@@ -32,10 +36,10 @@ runner:
   
 dataset:
   OmniObject3d_train:
-    root_dir: "/data/hofee/data/packed_preprocessed_data"
+    root_dir: "/home/data/hofee/project/nbv_rec/data/sample_for_training_new"
     model_dir: "../data/scaled_object_meshes"
     source: nbv_reconstruction_dataset
-    split_file: "/data/hofee/data/OmniObject3d_train_overfit.txt"
+    split_file: "/home/data/hofee/project/nbv_rec/data/sample.txt"
     type: train
     cache: True
     ratio: 1
@@ -44,27 +48,27 @@ dataset:
     pts_num: 4096
     load_from_preprocess: True
 
-  # OmniObject3d_test:
-  #   root_dir: "/data/hofee/data/packed_preprocessed_data"
-  #   model_dir: "../data/scaled_object_meshes"
-  #   source: nbv_reconstruction_dataset
-  #   split_file: "/data/hofee/data/OmniObject3d_test.txt"
-  #   type: test
-  #   cache: True
-  #   filter_degree: 75
-  #   eval_list:
-  #     - pose_diff
-  #   ratio: 0.05
-  #   batch_size: 160
-  #   num_workers: 12
-  #   pts_num: 4096
-  #   load_from_preprocess: True
-
-  OmniObject3d_val:
-    root_dir: "/data/hofee/data/packed_preprocessed_data"
+  OmniObject3d_test:
+    root_dir: "/home/data/hofee/project/nbv_rec/data/sample_for_training_new"
     model_dir: "../data/scaled_object_meshes"
     source: nbv_reconstruction_dataset
-    split_file: "/data/hofee/data/OmniObject3d_train_overfit.txt"
+    split_file: "/home/data/hofee/project/nbv_rec/data/sample.txt"
+    type: test
+    cache: True
+    filter_degree: 75
+    eval_list:
+      - pose_diff
+    ratio: 0.05
+    batch_size: 160
+    num_workers: 12
+    pts_num: 4096
+    load_from_preprocess: True
+
+  OmniObject3d_val:
+    root_dir: "/home/data/hofee/project/nbv_rec/data/sample_for_training_new"
+    model_dir: "../data/scaled_object_meshes"
+    source: nbv_reconstruction_dataset
+    split_file: "/home/data/hofee/project/nbv_rec/data/sample.txt"
     type: test
     cache: True
     filter_degree: 75