Remove descriptors and obj-obj/obj-hand inputs

PTG-Kitware · Apr 15, 2024 · a7e7f09 · a7e7f09
1 parent 5006be6
commit a7e7f09
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git a/angel_system/activity_classification/train_activity_classifier.py b/angel_system/activity_classification/train_activity_classifier.py
@@ -151,10 +151,6 @@ def compute_feats(
         ws = []
         hs = []
         label_confidences = []
-        obj_obj_contact_state = []
-        obj_obj_contact_conf = []
-        obj_hand_contact_state = []
-        obj_hand_contact_conf = []
 
         if objects_joints or hands_joints:
             joint_left_hand_offset = []
@@ -203,13 +199,6 @@ def compute_feats(
                     num_hands += 1
                 elif ann['category_id'] in object_inds:
                     num_objects += 1
-                try:
-                    obj_obj_contact_state.append(ann["obj-obj_contact_state"])
-                    obj_obj_contact_conf.append(ann["obj-obj_contact_conf"])
-                    obj_hand_contact_state.append(ann["obj-hand_contact_state"])
-                    obj_hand_contact_conf.append(ann["obj-hand_contact_conf"])
-                except KeyError:
-                    pass
 
 
         # hardcoded width?
@@ -308,11 +297,6 @@ def compute_feats(
             ws,
             hs,
             label_confidences,
-            None,
-            obj_obj_contact_state,
-            obj_obj_contact_conf,
-            obj_hand_contact_state,
-            obj_hand_contact_conf,
             label_to_ind,
             version=feat_version,
             top_n_objects=top_n_objects,

diff --git a/angel_system/activity_classification/utils.py b/angel_system/activity_classification/utils.py
@@ -44,11 +44,6 @@ def obj_det2d_set_to_feature(
     ws,
     hs,
     label_confidences,
-    descriptors,
-    obj_obj_contact_state,
-    obj_obj_contact_conf,
-    obj_hand_contact_state,
-    obj_hand_contact_conf,
     label_to_ind: Dict[str, int],
     version: int = 1,
     top_n_objects=3,