diff --git a/configs/Base-AGW.yml b/configs/Base-AGW.yml index c1cf68f..99db0e9 100644 --- a/configs/Base-AGW.yml +++ b/configs/Base-AGW.yml @@ -68,4 +68,3 @@ TEST: CUDNN_BENCHMARK: True -OUTPUT_DIR: "logs" diff --git a/configs/Base-Strongerbaseline.yml b/configs/Base-Strongerbaseline.yml index 024c36f..fbfbbb0 100644 --- a/configs/Base-Strongerbaseline.yml +++ b/configs/Base-Strongerbaseline.yml @@ -8,15 +8,15 @@ MODEL: DEPTH: 50 LAST_STRIDE: 1 WITH_IBN: False - WITH_NL: False + WITH_NL: True PRETRAIN: True HEADS: NAME: "BNneckHead" CLS_LAYER: "circle" POOL_LAYER: "gempool" - SCALE: 64 - MARGIN: 0.35 + SCALE: 128 + MARGIN: 0.25 LOSSES: NAME: ("CrossEntropyLoss", "TripletLoss",) @@ -78,7 +78,9 @@ SOLVER: TEST: EVAL_PERIOD: 2000 IMS_PER_BATCH: 512 + PRECISE_BN: + ENABLED: True + DATASET: 'DukeMTMC' CUDNN_BENCHMARK: True -OUTPUT_DIR: "logs/dukemtmc/softmax" diff --git a/configs/Base-bagtricks.yml b/configs/Base-bagtricks.yml index 0f03827..3cfcb1b 100644 --- a/configs/Base-bagtricks.yml +++ b/configs/Base-bagtricks.yml @@ -22,8 +22,8 @@ MODEL: SCALE: 1.0 TRI: - MARGIN: 0.0 - HARD_MINING: False + MARGIN: 0.3 + HARD_MINING: True USE_COSINE_DIST: False SCALE: 1.0 @@ -32,8 +32,8 @@ DATASETS: TESTS: ("DukeMTMC",) INPUT: - SIZE_TRAIN: [384, 128] - SIZE_TEST: [384, 128] + SIZE_TRAIN: [256, 128] + SIZE_TEST: [256, 128] REA: ENABLED: True PROB: 0.5 @@ -53,7 +53,7 @@ SOLVER: BIAS_LR_FACTOR: 2. WEIGHT_DECAY: 0.0005 WEIGHT_DECAY_BIAS: 0. - IMS_PER_BATCH: 128 + IMS_PER_BATCH: 64 STEPS: [8000, 14000] GAMMA: 0.1 @@ -70,4 +70,3 @@ TEST: CUDNN_BENCHMARK: True -OUTPUT_DIR: "logs/dukemtmc/softmax" diff --git a/configs/DukeMTMC/AGW.yml b/configs/DukeMTMC/AGW.yml index 9623395..04f305e 100644 --- a/configs/DukeMTMC/AGW.yml +++ b/configs/DukeMTMC/AGW.yml @@ -1,4 +1,4 @@ -_BASE_: "../Base-AGW.yml" +_BASE_: "../Base-AGW_R50.yml" MODEL: HEADS: diff --git a/configs/DukeMTMC/bagtricks_R101-ibn.yml b/configs/DukeMTMC/bagtricks_R101-ibn.yml new file mode 100644 index 0000000..043e5aa --- /dev/null +++ b/configs/DukeMTMC/bagtricks_R101-ibn.yml @@ -0,0 +1,24 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + DEPTH: 101 + WITH_IBN: True + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 702 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +OUTPUT_DIR: "logs/dukemtmc/bagtricks_R101-ibn" + diff --git a/configs/DukeMTMC/bagtricks_R50-ibn.yml b/configs/DukeMTMC/bagtricks_R50-ibn.yml new file mode 100644 index 0000000..73fd3d4 --- /dev/null +++ b/configs/DukeMTMC/bagtricks_R50-ibn.yml @@ -0,0 +1,23 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + WITH_IBN: True + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 702 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +OUTPUT_DIR: "logs/dukemtmc/bagtricks_R50-ibn" + diff --git a/configs/DukeMTMC/bagtricks.yml b/configs/DukeMTMC/bagtricks_R50.yml similarity index 56% rename from configs/DukeMTMC/bagtricks.yml rename to configs/DukeMTMC/bagtricks_R50.yml index 561946e..e2eb908 100644 --- a/configs/DukeMTMC/bagtricks.yml +++ b/configs/DukeMTMC/bagtricks_R50.yml @@ -5,14 +5,14 @@ MODEL: NUM_CLASSES: 702 SOLVER: - MAX_ITER: 12500 + MAX_ITER: 18000 - STEPS: [5000, 9000] + STEPS: [8000, 14000] - WARMUP_ITERS: 1250 + WARMUP_ITERS: 2000 DATASETS: NAMES: ("DukeMTMC",) TESTS: ("DukeMTMC",) -OUTPUT_DIR: "logs/dukemtmc/resnet50_baseline" +OUTPUT_DIR: "logs/dukemtmc/bagtricks_R50" diff --git a/configs/DukeMTMC/bagtricks_S50.yml b/configs/DukeMTMC/bagtricks_S50.yml new file mode 100644 index 0000000..b77277c --- /dev/null +++ b/configs/DukeMTMC/bagtricks_S50.yml @@ -0,0 +1,22 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + NAME: "build_resnest_backbone" + + HEADS: + NUM_CLASSES: 702 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +OUTPUT_DIR: "logs/dukemtmc/bagtricks_S50" + diff --git a/configs/DukeMTMC/sbs.yml b/configs/DukeMTMC/sbs.yml index 55cde02..c1dfc99 100644 --- a/configs/DukeMTMC/sbs.yml +++ b/configs/DukeMTMC/sbs.yml @@ -20,4 +20,4 @@ DATASETS: NAMES: ("DukeMTMC",) TESTS: ("DukeMTMC",) -OUTPUT_DIR: "logs/dukemtmc/test_prebn" +OUTPUT_DIR: "logs/dukemtmc/sbs" diff --git a/configs/MSMT17/AGW.yml b/configs/MSMT17/AGW.yml index aecd36b..2f0d905 100644 --- a/configs/MSMT17/AGW.yml +++ b/configs/MSMT17/AGW.yml @@ -1,4 +1,4 @@ -_BASE_: "../Base-AGW.yml" +_BASE_: "../Base-AGW_R50.yml" MODEL: HEADS: diff --git a/configs/MSMT17/bagtricks_R101-ibn.yml b/configs/MSMT17/bagtricks_R101-ibn.yml new file mode 100644 index 0000000..cb4b29f --- /dev/null +++ b/configs/MSMT17/bagtricks_R101-ibn.yml @@ -0,0 +1,25 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + DEPTH: 101 + WITH_IBN: True + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 1041 + +SOLVER: + MAX_ITER: 42000 + + STEPS: [19000, 33000] + + WARMUP_ITERS: 4700 + + +DATASETS: + NAMES: ("MSMT17",) + TESTS: ("MSMT17",) + +OUTPUT_DIR: "logs/msmt/bagtricks_R101-ibn" + diff --git a/configs/MSMT17/bagtricks_R50-ibn.yml b/configs/MSMT17/bagtricks_R50-ibn.yml new file mode 100644 index 0000000..3967bd9 --- /dev/null +++ b/configs/MSMT17/bagtricks_R50-ibn.yml @@ -0,0 +1,24 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + WITH_IBN: True + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 1041 + +SOLVER: + MAX_ITER: 42000 + + STEPS: [19000, 33000] + + WARMUP_ITERS: 4700 + + +DATASETS: + NAMES: ("MSMT17",) + TESTS: ("MSMT17",) + +OUTPUT_DIR: "logs/msmt/bagtricks_R50-ibn" + diff --git a/configs/MSMT17/bagtricks.yml b/configs/MSMT17/bagtricks_R50.yml similarity index 69% rename from configs/MSMT17/bagtricks.yml rename to configs/MSMT17/bagtricks_R50.yml index a350684..adca0ac 100644 --- a/configs/MSMT17/bagtricks.yml +++ b/configs/MSMT17/bagtricks_R50.yml @@ -4,18 +4,15 @@ MODEL: HEADS: NUM_CLASSES: 1041 +SOLVER: + MAX_ITER: 42000 + + STEPS: [19000, 33000] + + WARMUP_ITERS: 4700 + DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -SOLVER: - MAX_ITER: 42000 - STEPS: [19000, 33000] - WARMUP_ITERS: 4700 - - CHECKPOINT_PERIOD: 5000 - -TEST: - EVAL_PERIOD: 5000 - -OUTPUT_DIR: "logs/msmt17/bagtricks" +OUTPUT_DIR: "logs/msmt/bagtricks_R50" diff --git a/configs/MSMT17/bagtricks_S50.yml b/configs/MSMT17/bagtricks_S50.yml new file mode 100644 index 0000000..b9e788f --- /dev/null +++ b/configs/MSMT17/bagtricks_S50.yml @@ -0,0 +1,23 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + NAME: "build_resnest_backbone" + + HEADS: + NUM_CLASSES: 1041 + +SOLVER: + MAX_ITER: 42000 + + STEPS: [19000, 33000] + + WARMUP_ITERS: 4700 + + +DATASETS: + NAMES: ("MSMT17",) + TESTS: ("MSMT17",) + +OUTPUT_DIR: "logs/msmt/bagtricks_S50" + diff --git a/configs/Market1501/AGW_R50-ibn.yml b/configs/Market1501/AGW_R50-ibn.yml new file mode 100644 index 0000000..e83cb57 --- /dev/null +++ b/configs/Market1501/AGW_R50-ibn.yml @@ -0,0 +1,23 @@ +_BASE_: "../Base-AGW.yml" + +MODEL: + BACKBONE: + NAME: "build_resnet_backbone" + WITH_IBN: True + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 751 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("Market1501",) + TESTS: ("Market1501",) + +OUTPUT_DIR: "logs/market1501/agw_R50-ibn" diff --git a/configs/Market1501/AGW.yml b/configs/Market1501/AGW_R50.yml similarity index 83% rename from configs/Market1501/AGW.yml rename to configs/Market1501/AGW_R50.yml index 49537de..f1e54c9 100644 --- a/configs/Market1501/AGW.yml +++ b/configs/Market1501/AGW_R50.yml @@ -15,4 +15,4 @@ DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) -OUTPUT_DIR: "logs/market1501/agw" +OUTPUT_DIR: "logs/market1501/agw_R50" diff --git a/configs/Market1501/AGW_S50.yml b/configs/Market1501/AGW_S50.yml new file mode 100644 index 0000000..9695817 --- /dev/null +++ b/configs/Market1501/AGW_S50.yml @@ -0,0 +1,21 @@ +_BASE_: "../Base-AGW.yml" + +MODEL: + BACKBONE: + NAME: "build_resnest_backbone" + + HEADS: + NUM_CLASSES: 751 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("Market1501",) + TESTS: ("Market1501",) + +OUTPUT_DIR: "logs/market1501/agw_S50" diff --git a/configs/Market1501/bagtricks_R101-ibn.yml b/configs/Market1501/bagtricks_R101-ibn.yml new file mode 100644 index 0000000..0a3bda0 --- /dev/null +++ b/configs/Market1501/bagtricks_R101-ibn.yml @@ -0,0 +1,23 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + DEPTH: 101 + WITH_IBN: True + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 751 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("Market1501",) + TESTS: ("Market1501",) + +OUTPUT_DIR: "logs/market1501/bagtricks_R101-ibn" diff --git a/configs/Market1501/bagtricks_R50-ibn.yml b/configs/Market1501/bagtricks_R50-ibn.yml new file mode 100644 index 0000000..41b17b8 --- /dev/null +++ b/configs/Market1501/bagtricks_R50-ibn.yml @@ -0,0 +1,22 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + WITH_IBN: True + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 751 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("Market1501",) + TESTS: ("Market1501",) + +OUTPUT_DIR: "logs/market1501/bagtricks_R50-ibn" diff --git a/configs/Market1501/bagtricks.yml b/configs/Market1501/bagtricks_R50.yml similarity index 82% rename from configs/Market1501/bagtricks.yml rename to configs/Market1501/bagtricks_R50.yml index 3590d0e..a8d4363 100644 --- a/configs/Market1501/bagtricks.yml +++ b/configs/Market1501/bagtricks_R50.yml @@ -15,5 +15,4 @@ DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) - -OUTPUT_DIR: "logs/market1501/bagtricks" +OUTPUT_DIR: "logs/market1501/bagtricks_R50" diff --git a/configs/Market1501/bagtricks_S50.yml b/configs/Market1501/bagtricks_S50.yml new file mode 100644 index 0000000..2caeb30 --- /dev/null +++ b/configs/Market1501/bagtricks_S50.yml @@ -0,0 +1,21 @@ +_BASE_: "../Base-bagtricks.yml" + +MODEL: + BACKBONE: + NAME: "build_resnest_backbone" + + HEADS: + NUM_CLASSES: 751 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("Market1501",) + TESTS: ("Market1501",) + +OUTPUT_DIR: "logs/market1501/bagtricks_S50" diff --git a/configs/Market1501/sbs_R101-ibn.yml b/configs/Market1501/sbs_R101-ibn.yml new file mode 100644 index 0000000..11e446d --- /dev/null +++ b/configs/Market1501/sbs_R101-ibn.yml @@ -0,0 +1,28 @@ +_BASE_: "../Base-Strongerbaseline.yml" + +MODEL: + BACKBONE: + DEPTH: 101 + WITH_NL: False + WITH_IBN: True + PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 751 + +SOLVER: + MAX_ITER: 18000 + + STEPS: [8000, 14000] + + WARMUP_ITERS: 2000 + +DATASETS: + NAMES: ("Market1501",) + TESTS: ("Market1501",) + +TEST: + PRECISE_BN: + DATASET: 'Market1501' + +OUTPUT_DIR: "logs/market1501/bagtricks_R101-ibn" diff --git a/configs/Market1501/sbs_R50-ibn.yml b/configs/Market1501/sbs_R50-ibn.yml new file mode 100644 index 0000000..ce11a56 --- /dev/null +++ b/configs/Market1501/sbs_R50-ibn.yml @@ -0,0 +1,26 @@ +_BASE_: "../Base-Strongerbaseline.yml" + +MODEL: + BACKBONE: + WITH_IBN: True + PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 751 + +SOLVER: + MAX_ITER: 16000 + DELAY_ITERS: 8000 + WARMUP_ITERS: 2600 + FREEZE_ITERS: 2600 + +DATASETS: + NAMES: ("Market1501",) + TESTS: ("Market1501",) + +TEST: + EVAL_PERIOD: 2000 + PRECISE_BN: + DATASET: 'Market1501' + +OUTPUT_DIR: "logs/market1501/sbs_R50-ibn" diff --git a/configs/Market1501/sbs_R50.yml b/configs/Market1501/sbs_R50.yml new file mode 100644 index 0000000..8e1f1f4 --- /dev/null +++ b/configs/Market1501/sbs_R50.yml @@ -0,0 +1,21 @@ +_BASE_: "../Base-Strongerbaseline.yml" + +MODEL: + HEADS: + NUM_CLASSES: 751 + +SOLVER: + MAX_ITER: 16000 + DELAY_ITERS: 8000 + WARMUP_ITERS: 2600 + FREEZE_ITERS: 2600 + +DATASETS: + NAMES: ("Market1501",) + TESTS: ("Market1501",) + +TEST: + PRECISE_BN: + DATASET: 'Market1501' + +OUTPUT_DIR: "logs/market1501/sbs_R50" diff --git a/configs/Market1501/sbs.yml b/configs/Market1501/sbs_S50.yml similarity index 54% rename from configs/Market1501/sbs.yml rename to configs/Market1501/sbs_S50.yml index fa84751..7aaeee0 100644 --- a/configs/Market1501/sbs.yml +++ b/configs/Market1501/sbs_S50.yml @@ -3,9 +3,6 @@ _BASE_: "../Base-Strongerbaseline.yml" MODEL: BACKBONE: NAME: "build_resnest_backbone" - WITH_IBN: False - WITH_NL: True - PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" HEADS: NUM_CLASSES: 751 @@ -21,6 +18,7 @@ DATASETS: TESTS: ("Market1501",) TEST: - EVAL_PERIOD: 2000 + PRECISE_BN: + DATASET: 'Market1501' -OUTPUT_DIR: "logs/market1501/resnest-nl-gem-circle_s64m0.35_loss-cos_delay-autoaug" +OUTPUT_DIR: "logs/market1501/sbs_S50"