From 99b9ae06042791d35e534ff916ef43243bd05eff Mon Sep 17 00:00:00 2001 From: liuxingyu <lxy17@foxmail.com> Date: Sat, 15 Oct 2022 16:56:06 +0800 Subject: [PATCH] reformat --- ...ay_BG05_mlL1_DMask_amodalClipBox_classAware_hb.py | 3 +-- .../01_coffee_cup.py | 2 +- ...BG05_mlL1_DMask_amodalClipBox_classAware_icbin.py | 2 +- ...BG05_mlL1_DMask_amodalClipBox_classAware_itodd.py | 2 +- ...y_BG05_mlL1_DMask_amodalClipBox_classAware_lmo.py | 3 +-- ...BG05_mlL1_DMask_amodalClipBox_classAware_tless.py | 7 +++++-- ..._BG05_mlL1_DMask_amodalClipBox_classAware_ycbv.py | 2 +- .../tools/convert_det_to_our_format_1b.py | 12 +++++++++--- ref/tless.py | 2 +- 9 files changed, 21 insertions(+), 14 deletions(-) diff --git a/configs/gdrn/hb_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_hb.py b/configs/gdrn/hb_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_hb.py index c8d119a..c0eda0c 100644 --- a/configs/gdrn/hb_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_hb.py +++ b/configs/gdrn/hb_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_hb.py @@ -32,7 +32,7 @@ INPUT = dict( SOLVER = dict( IMS_PER_BATCH=48, - TOTAL_EPOCHS=40, # 30 + TOTAL_EPOCHS=40, # 30 LR_SCHEDULER_NAME="flat_and_anneal", ANNEAL_METHOD="cosine", # "cosine" ANNEAL_POINT=0.72, @@ -148,4 +148,3 @@ TEST = dict( VIS=False, TEST_BBOX_TYPE="est", ) # gt | est - diff --git a/configs/gdrn/icbinPbrSO/convnext_AugCosyAAEGray_DMask_amodalClipBox_icbin/01_coffee_cup.py b/configs/gdrn/icbinPbrSO/convnext_AugCosyAAEGray_DMask_amodalClipBox_icbin/01_coffee_cup.py index 3c283ec..9c0a654 100644 --- a/configs/gdrn/icbinPbrSO/convnext_AugCosyAAEGray_DMask_amodalClipBox_icbin/01_coffee_cup.py +++ b/configs/gdrn/icbinPbrSO/convnext_AugCosyAAEGray_DMask_amodalClipBox_icbin/01_coffee_cup.py @@ -32,7 +32,7 @@ INPUT = dict( SOLVER = dict( IMS_PER_BATCH=36, - TOTAL_EPOCHS=100, # 15 + TOTAL_EPOCHS=100, # 15 LR_SCHEDULER_NAME="flat_and_anneal", ANNEAL_METHOD="cosine", # "cosine" ANNEAL_POINT=0.72, diff --git a/configs/gdrn/icbin_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_icbin.py b/configs/gdrn/icbin_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_icbin.py index b1080d6..8bdb1b5 100644 --- a/configs/gdrn/icbin_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_icbin.py +++ b/configs/gdrn/icbin_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_icbin.py @@ -32,7 +32,7 @@ INPUT = dict( SOLVER = dict( IMS_PER_BATCH=48, - TOTAL_EPOCHS=40, # 10 + TOTAL_EPOCHS=40, # 10 LR_SCHEDULER_NAME="flat_and_anneal", ANNEAL_METHOD="cosine", # "cosine" ANNEAL_POINT=0.72, diff --git a/configs/gdrn/itodd_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_itodd.py b/configs/gdrn/itodd_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_itodd.py index a26a2ae..70adec5 100644 --- a/configs/gdrn/itodd_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_itodd.py +++ b/configs/gdrn/itodd_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_itodd.py @@ -36,7 +36,7 @@ INPUT = dict( SOLVER = dict( IMS_PER_BATCH=48, - TOTAL_EPOCHS=40, # 25 + TOTAL_EPOCHS=40, # 25 LR_SCHEDULER_NAME="flat_and_anneal", ANNEAL_METHOD="cosine", # "cosine" ANNEAL_POINT=0.72, diff --git a/configs/gdrn/lmo_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_lmo.py b/configs/gdrn/lmo_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_lmo.py index 5b425db..55f72e1 100644 --- a/configs/gdrn/lmo_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_lmo.py +++ b/configs/gdrn/lmo_pbr/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_lmo.py @@ -32,7 +32,7 @@ INPUT = dict( SOLVER = dict( IMS_PER_BATCH=48, - TOTAL_EPOCHS=40, # 30 + TOTAL_EPOCHS=40, # 30 LR_SCHEDULER_NAME="flat_and_anneal", ANNEAL_METHOD="cosine", # "cosine" ANNEAL_POINT=0.72, @@ -140,4 +140,3 @@ VAL = dict( ) TEST = dict(EVAL_PERIOD=0, VIS=False, TEST_BBOX_TYPE="est") # gt | est - diff --git a/configs/gdrn/tless/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_tless.py b/configs/gdrn/tless/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_tless.py index 06268dc..ab7313b 100644 --- a/configs/gdrn/tless/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_tless.py +++ b/configs/gdrn/tless/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_tless.py @@ -33,7 +33,7 @@ INPUT = dict( SOLVER = dict( IMS_PER_BATCH=48, - TOTAL_EPOCHS=40, # 30 + TOTAL_EPOCHS=40, # 30 LR_SCHEDULER_NAME="flat_and_anneal", ANNEAL_METHOD="cosine", # "cosine" ANNEAL_POINT=0.72, @@ -44,7 +44,10 @@ SOLVER = dict( ) DATASETS = dict( - TRAIN=("tless_train_primesense", "tless_train_pbr",), + TRAIN=( + "tless_train_primesense", + "tless_train_pbr", + ), TEST=("tless_bop_test_primesense",), # AP AP50 AP75 AR inf.time DET_FILES_TEST=("datasets/BOP_DATASETS/tless/test/test_bboxes/yolox_x_640_tless_real_pbr_tless_bop_test.json",), diff --git a/configs/gdrn/ycbv/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_ycbv.py b/configs/gdrn/ycbv/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_ycbv.py index 3904ae7..823c7ad 100644 --- a/configs/gdrn/ycbv/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_ycbv.py +++ b/configs/gdrn/ycbv/convnext_a6_AugCosyAAEGray_BG05_mlL1_DMask_amodalClipBox_classAware_ycbv.py @@ -33,7 +33,7 @@ INPUT = dict( SOLVER = dict( IMS_PER_BATCH=48, - TOTAL_EPOCHS=40, # 10 + TOTAL_EPOCHS=40, # 10 LR_SCHEDULER_NAME="flat_and_anneal", ANNEAL_METHOD="cosine", # "cosine" ANNEAL_POINT=0.72, diff --git a/core/gdrn_modeling/tools/convert_det_to_our_format_1b.py b/core/gdrn_modeling/tools/convert_det_to_our_format_1b.py index d11dff0..5b9569e 100644 --- a/core/gdrn_modeling/tools/convert_det_to_our_format_1b.py +++ b/core/gdrn_modeling/tools/convert_det_to_our_format_1b.py @@ -5,12 +5,18 @@ import json import os parser = argparse.ArgumentParser(description="convert det from bop format to ours") -parser.add_argument("--idir", type=str, default="/data1/tangjw/projects/YOLOX_benckmark/master/object_pose_benchmark/output/yolox/bop_pbr/multi_scale_test", help="input path") +parser.add_argument( + "--idir", + type=str, + default="/data1/tangjw/projects/YOLOX_benckmark/master/object_pose_benchmark/output/yolox/bop_pbr/multi_scale_test", + help="input path", +) parser.add_argument("--odir", type=str, default="datasets/BOP_DATASETS/", help="output path") args = parser.parse_args() dataset_names = ["hb", "icbin", "itodd", "lmo", "tless", "tudl", "ycbv"] + def convert_format(ipath, opath): ds = mmcv.load(ipath) outs = {} @@ -80,8 +86,8 @@ if __name__ == "__main__": for json_file in json_files: for dset in dataset_names: if dset in json_file: - break - + break + ipath = os.path.join(args.idir, json_file) odir = os.path.join(args.odir, dset, "test/test_bboxes") diff --git a/ref/tless.py b/ref/tless.py index 4e5e0a7..deace79 100644 --- a/ref/tless.py +++ b/ref/tless.py @@ -23,7 +23,7 @@ train_render_dir = osp.join(dataset_root, "train_render_reconst") test_dir = osp.join(dataset_root, "test_primesense") # model_dir = osp.join(dataset_root, "models_reconst") # use recon models as default -model_dir = osp.join(dataset_root, "models_cad") +model_dir = osp.join(dataset_root, "models_cad") model_cad = osp.join(dataset_root, "models_cad") model_reconst_dir = osp.join(dataset_root, "models_reconst") model_eval_dir = osp.join(dataset_root, "models_eval") -- GitLab