From 1133a92785da814f25d10a9c2d79713c225a7eb5 Mon Sep 17 00:00:00 2001 From: hokuto-munakata Date: Fri, 20 Sep 2024 16:32:11 +0900 Subject: [PATCH] Rename unav100 -> unav100-subset --- configs/dataset/{unav100.yml => unav100-subset.yml} | 2 +- .../unav100-subset_test_release.jsonl} | 0 training/cg_detr_dataset.py | 4 ++-- training/dataset.py | 6 +++--- training/evaluate.py | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) rename configs/dataset/{unav100.yml => unav100-subset.yml} (64%) rename data/{unav100/unav100_test_release.jsonl => unav100-subset/unav100-subset_test_release.jsonl} (100%) diff --git a/configs/dataset/unav100.yml b/configs/dataset/unav100-subset.yml similarity index 64% rename from configs/dataset/unav100.yml rename to configs/dataset/unav100-subset.yml index 45bea7b..22f1c25 100644 --- a/configs/dataset/unav100.yml +++ b/configs/dataset/unav100-subset.yml @@ -1,4 +1,4 @@ -dset_name: unav100 +dset_name: unav100-subset clip_length: 1 train_path: null eval_path: null diff --git a/data/unav100/unav100_test_release.jsonl b/data/unav100-subset/unav100-subset_test_release.jsonl similarity index 100% rename from data/unav100/unav100_test_release.jsonl rename to data/unav100-subset/unav100-subset_test_release.jsonl diff --git a/training/cg_detr_dataset.py b/training/cg_detr_dataset.py index 15945e0..64c932e 100644 --- a/training/cg_detr_dataset.py +++ b/training/cg_detr_dataset.py @@ -196,7 +196,7 @@ def __getitem__(self, index): else: model_inputs["saliency_pos_labels"], model_inputs["saliency_neg_labels"], model_inputs["saliency_all_labels"] = \ self.get_saliency_labels_all(meta["relevant_clip_ids"], meta["saliency_scores"], ctx_l) - elif self.dset_name in ['charades', 'tacos', 'activitynet', 'clotho-moment', 'unav100', 'tut2017']: ## charades, tacos, nlq + elif self.dset_name in ['charades', 'tacos', 'activitynet', 'clotho-moment', 'unav100-subset', 'tut2017']: ## charades, tacos, nlq model_inputs["saliency_pos_labels"], model_inputs["saliency_neg_labels"], model_inputs["saliency_all_labels"] = \ self.get_saliency_labels_sub_as_query(meta["relevant_windows"][0], meta["duration"], ctx_l) # only one gt else: @@ -458,7 +458,7 @@ def _get_audio_feat_by_vid(self, vid): raise NotImplementedError _feat = l2_normalize_np_array(_feat) # normalize? a_feat_list.append(_feat) - elif self.dset_name in ['clotho-moment', 'unav100', 'tut2017']: + elif self.dset_name in ['clotho-moment', 'unav100-subset', 'tut2017']: if self.a_feat_types == "clap": _feat_path = join(_feat_dir, f"{vid}.npz") _feat = np.load(_feat_path)["features"][:self.max_a_l].astype(np.float32) diff --git a/training/dataset.py b/training/dataset.py index 2ad0400..d8053d7 100755 --- a/training/dataset.py +++ b/training/dataset.py @@ -212,7 +212,7 @@ def __getitem__(self, index): model_inputs["saliency_pos_labels"], model_inputs["saliency_neg_labels"], model_inputs["saliency_all_labels"] = \ self.get_saliency_labels_all(meta["relevant_clip_ids"], meta["saliency_scores"], ctx_l) - elif self.dset_name in ['charades', 'tacos', 'activitynet', 'clotho-moment', 'unav100', 'tut2017']: + elif self.dset_name in ['charades', 'tacos', 'activitynet', 'clotho-moment', 'unav100-subset', 'tut2017']: model_inputs["saliency_pos_labels"], model_inputs["saliency_neg_labels"], model_inputs["saliency_all_labels"] = \ self.get_saliency_labels_sub_as_query(meta["relevant_windows"][0], ctx_l) else: @@ -241,7 +241,7 @@ def get_pos_mask(self, meta, ctx_l): else: mask[pos_idx] = 1 - if self.dset_name in ['charades', 'tacos', 'activitynet', 'clotho-moment', 'unav100', 'tut2017']: + if self.dset_name in ['charades', 'tacos', 'activitynet', 'clotho-moment', 'unav100-subset', 'tut2017']: mask = mask[:ctx_l] return mask @@ -480,7 +480,7 @@ def _get_audio_feat_by_vid(self, vid): raise NotImplementedError _feat = l2_normalize_np_array(_feat) # normalize? a_feat_list.append(_feat) - elif self.dset_name in ['clotho-moment', 'unav100', 'tut2017']: + elif self.dset_name in ['clotho-moment', 'unav100-subset', 'tut2017']: if self.a_feat_types == "clap": _feat_path = join(_feat_dir, f"{vid}.npz") _feat = np.load(_feat_path)["features"][:self.max_a_l].astype(np.float32) diff --git a/training/evaluate.py b/training/evaluate.py index 9c89ede..022b126 100755 --- a/training/evaluate.py +++ b/training/evaluate.py @@ -252,7 +252,7 @@ def compute_mr_results(epoch_i, model, eval_loader, opt, criterion=None): min_w_l=2, max_w_l=150, move_window_method="left", process_func_names=("clip_ts", "round_multiple") ) - elif opt.dset_name in ['charades', 'clotho-moment', 'unav100', 'tut2017']: + elif opt.dset_name in ['charades', 'clotho-moment', 'unav100-subset', 'tut2017']: post_processor = PostProcessorDETR( clip_length=opt.clip_length, min_ts_val=0, max_ts_val=150, min_w_l=2, max_w_l=60, move_window_method="left", @@ -409,8 +409,8 @@ def check_valid_combination(dataset, feature): choices=['moment_detr', 'qd_detr', 'eatr', 'cg_detr', 'uvcom', 'tr_detr', 'taskweave_hd2mr', 'taskweave_mr2hd'], help='model name. select from [moment_detr, qd_detr, eatr, cg_detr, uvcom, tr_detr, taskweave_hd2mr, taskweave_mr2hd]') parser.add_argument('--dataset', '-d', type=str, required=True, - choices=['activitynet', 'charades', 'qvhighlight', 'qvhighlight_pretrain', 'tacos', 'tvsum', 'youtube_highlight', 'clotho-moment', 'unav100', 'tut2017'], - help='dataset name. select from [activitynet, charades, qvhighlight, qvhighlight_pretrain, tacos, tvsum, youtube_highlight, clotho-moment, unav100, tut2017]') + choices=['activitynet', 'charades', 'qvhighlight', 'qvhighlight_pretrain', 'tacos', 'tvsum', 'youtube_highlight', 'clotho-moment', 'unav100-subset', 'tut2017'], + help='dataset name. select from [activitynet, charades, qvhighlight, qvhighlight_pretrain, tacos, tvsum, youtube_highlight, clotho-moment, unav100-subset, tut2017]') parser.add_argument('--feature', '-f', type=str, required=True, choices=['resnet_glove', 'clip', 'clip_slowfast', 'clip_slowfast_pann', 'i3d_clip', 'clap'], help='feature name. select from [resnet_glove, clip, clip_slowfast, clip_slowfast_pann, i3d_clip, clap].'