From 46228ce946283d68d2b8549df8c958131d7702d9 Mon Sep 17 00:00:00 2001 From: liaoxingyu Date: Fri, 1 May 2020 09:04:51 +0800 Subject: [PATCH] chore(configs): update all training config --- MODEL_ZOO.md | 6 ++--- configs/Base-AGW.yml | 5 ++-- configs/Base-Strongerbaseline.yml | 14 +++++------ configs/Base-bagtricks.yml | 17 +++++++------ configs/DukeMTMC/AGW.yml | 18 -------------- configs/DukeMTMC/AGW_R50-ibn.yml | 16 +++++++++++++ configs/DukeMTMC/AGW_R50.yml | 12 ++++++++++ configs/DukeMTMC/AGW_S50.yml | 15 ++++++++++++ configs/DukeMTMC/bagtricks_R101-ibn.yml | 8 ------- configs/DukeMTMC/bagtricks_R50-ibn.yml | 8 ------- configs/DukeMTMC/bagtricks_R50.yml | 6 ----- configs/DukeMTMC/bagtricks_S50.yml | 8 ------- configs/DukeMTMC/sbs.yml | 23 ------------------ configs/DukeMTMC/sbs_R101-ibn.yml | 21 ++++++++++++++++ configs/DukeMTMC/sbs_R50-ibn.yml | 20 ++++++++++++++++ configs/DukeMTMC/sbs_R50.yml | 15 ++++++++++++ configs/DukeMTMC/sbs_S50.yml | 22 +++++++++++++++++ configs/MSMT17/AGW_R50-ibn.yml | 25 +++++++++++++++++++ configs/MSMT17/{AGW.yml => AGW_R50.yml} | 5 ++-- configs/MSMT17/AGW_S50.yml | 24 +++++++++++++++++++ configs/MSMT17/bagtricks_R101-ibn.yml | 11 +++++---- configs/MSMT17/bagtricks_R50-ibn.yml | 11 +++++---- configs/MSMT17/bagtricks_R50.yml | 8 ++++--- configs/MSMT17/bagtricks_S50.yml | 9 +++---- configs/MSMT17/sbs.yml | 29 ----------------------- configs/MSMT17/sbs_R101-ibn.yml | 28 ++++++++++++++++++++++ configs/MSMT17/sbs_R50-ibn.yml | 26 ++++++++++++++++++++ configs/MSMT17/sbs_R50.yml | 22 +++++++++++++++++ configs/MSMT17/sbs_S50.yml | 29 +++++++++++++++++++++++ configs/Market1501/AGW_R50-ibn.yml | 6 ----- configs/Market1501/AGW_R50.yml | 6 ----- configs/Market1501/AGW_S50.yml | 8 +------ configs/Market1501/bagtricks_R101-ibn.yml | 6 ----- configs/Market1501/bagtricks_R50-ibn.yml | 6 ----- configs/Market1501/bagtricks_R50.yml | 7 +----- configs/Market1501/bagtricks_S50.yml | 6 ----- configs/Market1501/sbs_R101-ibn.yml | 9 +------ configs/Market1501/sbs_R50-ibn.yml | 8 +------ configs/Market1501/sbs_R50.yml | 6 ----- configs/Market1501/sbs_S50.yml | 8 +++---- 40 files changed, 329 insertions(+), 208 deletions(-) delete mode 100644 configs/DukeMTMC/AGW.yml create mode 100644 configs/DukeMTMC/AGW_R50-ibn.yml create mode 100644 configs/DukeMTMC/AGW_R50.yml create mode 100644 configs/DukeMTMC/AGW_S50.yml delete mode 100644 configs/DukeMTMC/sbs.yml create mode 100644 configs/DukeMTMC/sbs_R101-ibn.yml create mode 100644 configs/DukeMTMC/sbs_R50-ibn.yml create mode 100644 configs/DukeMTMC/sbs_R50.yml create mode 100644 configs/DukeMTMC/sbs_S50.yml create mode 100644 configs/MSMT17/AGW_R50-ibn.yml rename configs/MSMT17/{AGW.yml => AGW_R50.yml} (78%) create mode 100644 configs/MSMT17/AGW_S50.yml delete mode 100644 configs/MSMT17/sbs.yml create mode 100644 configs/MSMT17/sbs_R101-ibn.yml create mode 100644 configs/MSMT17/sbs_R50-ibn.yml create mode 100644 configs/MSMT17/sbs_R50.yml create mode 100644 configs/MSMT17/sbs_S50.yml diff --git a/MODEL_ZOO.md b/MODEL_ZOO.md index fbc86c3..598fc60 100644 --- a/MODEL_ZOO.md +++ b/MODEL_ZOO.md @@ -9,8 +9,8 @@ | Method | Pretrained | Rank@1 | mAP | mINP | | :---: | :---: | :---: |:---: | :---: | -| BoT(R50) | ImageNet | 93.6% | 85.1% | 58.1% | -| BoT(R50-ibn) | ImageNet | 94.8% | 87.3% | 63.5% | +| BoT(R50) | ImageNet | 94.1% | 85.9% | 59.3% | +| BoT(R50-ibn) | ImageNet | - | - | - | | BoT(S50) | ImageNet | - | - | - | | BoT(R101-ibn) | ImageNet| - | - | @@ -27,7 +27,7 @@ | Method | Pretrained | Rank@1 | mAP | mINP | | :---: | :---: | :---: |:---: | :---: | | SBS(R50) | ImageNet | - | - | - | -| SBS(R50-ibn) | ImageNet | 95.5% | 88.4% | 65.8% | +| SBS(R50-ibn) | ImageNet | 95.5% | 88.7% | 66.4% | | SBS(S50) | ImageNet | - | - | - | | SBS(R101-ibn) | ImageNet | - | - | - | diff --git a/configs/Base-AGW.yml b/configs/Base-AGW.yml index 99db0e9..477ef85 100644 --- a/configs/Base-AGW.yml +++ b/configs/Base-AGW.yml @@ -11,6 +11,7 @@ MODEL: HEADS: NAME: "BNneckHead" POOL_LAYER: "gempool" + NECK_FEAT: "before" CLS_LAYER: "linear" NUM_CLASSES: 702 @@ -46,14 +47,14 @@ DATALOADER: SOLVER: OPT: "Adam" - MAX_ITER: 18000 + MAX_ITER: 24000 BASE_LR: 0.00035 BIAS_LR_FACTOR: 2. WEIGHT_DECAY: 0.0005 WEIGHT_DECAY_BIAS: 0.0005 IMS_PER_BATCH: 64 - STEPS: [8000, 14000] + STEPS: [8000, 18000] GAMMA: 0.1 WARMUP_FACTOR: 0.01 diff --git a/configs/Base-Strongerbaseline.yml b/configs/Base-Strongerbaseline.yml index fbfbbb0..8e673d9 100644 --- a/configs/Base-Strongerbaseline.yml +++ b/configs/Base-Strongerbaseline.yml @@ -5,6 +5,7 @@ MODEL: BACKBONE: NAME: "build_resnet_backbone" + NORM: "BN" DEPTH: 50 LAST_STRIDE: 1 WITH_IBN: False @@ -13,10 +14,12 @@ MODEL: HEADS: NAME: "BNneckHead" + NORM: "BN" + NECK_FEAT: "after" CLS_LAYER: "circle" POOL_LAYER: "gempool" - SCALE: 128 - MARGIN: 0.25 + SCALE: 64 + MARGIN: 0.35 LOSSES: NAME: ("CrossEntropyLoss", "TripletLoss",) @@ -61,12 +64,9 @@ SOLVER: SCHED: "DelayedCosineAnnealingLR" - DELAY_ITERS: 2000 + DELAY_ITERS: 9000 ETA_MIN_LR: 0.00000077 - STEPS: [8000, 14000] - GAMMA: 0.1 - WARMUP_FACTOR: 0.01 WARMUP_ITERS: 2000 @@ -79,7 +79,7 @@ TEST: EVAL_PERIOD: 2000 IMS_PER_BATCH: 512 PRECISE_BN: - ENABLED: True + ENABLED: False DATASET: 'DukeMTMC' CUDNN_BENCHMARK: True diff --git a/configs/Base-bagtricks.yml b/configs/Base-bagtricks.yml index 3cfcb1b..df6f83c 100644 --- a/configs/Base-bagtricks.yml +++ b/configs/Base-bagtricks.yml @@ -1,10 +1,11 @@ MODEL: - META_ARCHITECTURE: 'Baseline' + META_ARCHITECTURE: "Baseline" OPEN_LAYERS: "" BACKBONE: NAME: "build_resnet_backbone" + NORM: "BN" DEPTH: 50 LAST_STRIDE: 1 WITH_IBN: False @@ -12,20 +13,22 @@ MODEL: HEADS: NAME: "BNneckHead" + NORM: "BN" + NECK_FEAT: "before" CLS_LAYER: "linear" LOSSES: - NAME: ("CrossEntropyLoss", "TripletLoss") + NAME: ("CrossEntropyLoss", "TripletLoss", ) CE: EPSILON: 0.1 - SCALE: 1.0 + SCALE: 1. TRI: MARGIN: 0.3 HARD_MINING: True USE_COSINE_DIST: False - SCALE: 1.0 + SCALE: 1. DATASETS: NAMES: ("DukeMTMC",) @@ -48,14 +51,14 @@ DATALOADER: SOLVER: OPT: "Adam" - MAX_ITER: 18000 + MAX_ITER: 24000 BASE_LR: 0.00035 BIAS_LR_FACTOR: 2. WEIGHT_DECAY: 0.0005 - WEIGHT_DECAY_BIAS: 0. + WEIGHT_DECAY_BIAS: 0.0005 IMS_PER_BATCH: 64 - STEPS: [8000, 14000] + STEPS: [8000, 18000] GAMMA: 0.1 WARMUP_FACTOR: 0.01 diff --git a/configs/DukeMTMC/AGW.yml b/configs/DukeMTMC/AGW.yml deleted file mode 100644 index 04f305e..0000000 --- a/configs/DukeMTMC/AGW.yml +++ /dev/null @@ -1,18 +0,0 @@ -_BASE_: "../Base-AGW_R50.yml" - -MODEL: - HEADS: - NUM_CLASSES: 702 - -SOLVER: - MAX_ITER: 23000 - - STEPS: [10000, 18000] - - WARMUP_ITERS: 2500 - -DATASETS: - NAMES: ("DukeMTMC",) - TESTS: ("DukeMTMC",) - -OUTPUT_DIR: "logs/dukemtmc/agw" diff --git a/configs/DukeMTMC/AGW_R50-ibn.yml b/configs/DukeMTMC/AGW_R50-ibn.yml new file mode 100644 index 0000000..f4cd54a --- /dev/null +++ b/configs/DukeMTMC/AGW_R50-ibn.yml @@ -0,0 +1,16 @@ +_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: 702 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +OUTPUT_DIR: "logs/dukemtmc/agw_R50-ibn" diff --git a/configs/DukeMTMC/AGW_R50.yml b/configs/DukeMTMC/AGW_R50.yml new file mode 100644 index 0000000..bf3ecc7 --- /dev/null +++ b/configs/DukeMTMC/AGW_R50.yml @@ -0,0 +1,12 @@ +_BASE_: "../Base-AGW.yml" + +MODEL: + HEADS: + NUM_CLASSES: 702 + + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +OUTPUT_DIR: "logs/dukemtmc/agw_R50" diff --git a/configs/DukeMTMC/AGW_S50.yml b/configs/DukeMTMC/AGW_S50.yml new file mode 100644 index 0000000..1563e84 --- /dev/null +++ b/configs/DukeMTMC/AGW_S50.yml @@ -0,0 +1,15 @@ +_BASE_: "../Base-AGW.yml" + +MODEL: + BACKBONE: + NAME: "build_resnest_backbone" + + HEADS: + NECK_FEAT: "after" + NUM_CLASSES: 702 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +OUTPUT_DIR: "logs/dukemtmc/agw_S50" diff --git a/configs/DukeMTMC/bagtricks_R101-ibn.yml b/configs/DukeMTMC/bagtricks_R101-ibn.yml index 043e5aa..961f072 100644 --- a/configs/DukeMTMC/bagtricks_R101-ibn.yml +++ b/configs/DukeMTMC/bagtricks_R101-ibn.yml @@ -9,16 +9,8 @@ MODEL: 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 index 73fd3d4..d9c0ebe 100644 --- a/configs/DukeMTMC/bagtricks_R50-ibn.yml +++ b/configs/DukeMTMC/bagtricks_R50-ibn.yml @@ -8,16 +8,8 @@ MODEL: 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_R50.yml b/configs/DukeMTMC/bagtricks_R50.yml index e2eb908..f487215 100644 --- a/configs/DukeMTMC/bagtricks_R50.yml +++ b/configs/DukeMTMC/bagtricks_R50.yml @@ -4,12 +4,6 @@ MODEL: HEADS: NUM_CLASSES: 702 -SOLVER: - MAX_ITER: 18000 - - STEPS: [8000, 14000] - - WARMUP_ITERS: 2000 DATASETS: NAMES: ("DukeMTMC",) diff --git a/configs/DukeMTMC/bagtricks_S50.yml b/configs/DukeMTMC/bagtricks_S50.yml index b77277c..cd551cc 100644 --- a/configs/DukeMTMC/bagtricks_S50.yml +++ b/configs/DukeMTMC/bagtricks_S50.yml @@ -7,16 +7,8 @@ MODEL: 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 deleted file mode 100644 index c1dfc99..0000000 --- a/configs/DukeMTMC/sbs.yml +++ /dev/null @@ -1,23 +0,0 @@ -_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: 702 - -SOLVER: - MAX_ITER: 5 - DELAY_ITERS: 8000 - WARMUP_ITERS: 2600 - FREEZE_ITERS: 2600 - -DATASETS: - NAMES: ("DukeMTMC",) - TESTS: ("DukeMTMC",) - -OUTPUT_DIR: "logs/dukemtmc/sbs" diff --git a/configs/DukeMTMC/sbs_R101-ibn.yml b/configs/DukeMTMC/sbs_R101-ibn.yml new file mode 100644 index 0000000..abcbec8 --- /dev/null +++ b/configs/DukeMTMC/sbs_R101-ibn.yml @@ -0,0 +1,21 @@ +_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: 702 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +TEST: + PRECISE_BN: + DATASET: 'DukeMTMC' + +OUTPUT_DIR: "logs/dukemtmc/sbs-R101-ibn" diff --git a/configs/DukeMTMC/sbs_R50-ibn.yml b/configs/DukeMTMC/sbs_R50-ibn.yml new file mode 100644 index 0000000..948eb4a --- /dev/null +++ b/configs/DukeMTMC/sbs_R50-ibn.yml @@ -0,0 +1,20 @@ +_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: 702 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +TEST: + EVAL_PERIOD: 2000 + PRECISE_BN: + DATASET: 'DukeMTMC' + +OUTPUT_DIR: "logs/dukemtmc/sbs_R50-ibn" diff --git a/configs/DukeMTMC/sbs_R50.yml b/configs/DukeMTMC/sbs_R50.yml new file mode 100644 index 0000000..cc35b5f --- /dev/null +++ b/configs/DukeMTMC/sbs_R50.yml @@ -0,0 +1,15 @@ +_BASE_: "../Base-Strongerbaseline.yml" + +MODEL: + HEADS: + NUM_CLASSES: 702 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +TEST: + PRECISE_BN: + DATASET: 'DukeMTMC' + +OUTPUT_DIR: "logs/dukemtmc/sbs_R50" diff --git a/configs/DukeMTMC/sbs_S50.yml b/configs/DukeMTMC/sbs_S50.yml new file mode 100644 index 0000000..be861aa --- /dev/null +++ b/configs/DukeMTMC/sbs_S50.yml @@ -0,0 +1,22 @@ +_BASE_: "../Base-Strongerbaseline.yml" + +MODEL: + BACKBONE: + NAME: "build_resnest_backbone" + + HEADS: + NUM_CLASSES: 702 + + LOSSES: + TRI: + MARGIN: 0.3 + +DATASETS: + NAMES: ("DukeMTMC",) + TESTS: ("DukeMTMC",) + +TEST: + PRECISE_BN: + DATASET: 'DukeMTMC' + +OUTPUT_DIR: "logs/dukemtmc/sbs_S50" diff --git a/configs/MSMT17/AGW_R50-ibn.yml b/configs/MSMT17/AGW_R50-ibn.yml new file mode 100644 index 0000000..5bf2efb --- /dev/null +++ b/configs/MSMT17/AGW_R50-ibn.yml @@ -0,0 +1,25 @@ +_BASE_: "../Base-AGW.yml" + +MODEL: + BACKBONE: + WITH_IBN: True + PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + + HEADS: + NUM_CLASSES: 1041 + +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/agw_R50-ibn" diff --git a/configs/MSMT17/AGW.yml b/configs/MSMT17/AGW_R50.yml similarity index 78% rename from configs/MSMT17/AGW.yml rename to configs/MSMT17/AGW_R50.yml index 2f0d905..f9d5c18 100644 --- a/configs/MSMT17/AGW.yml +++ b/configs/MSMT17/AGW_R50.yml @@ -1,4 +1,4 @@ -_BASE_: "../Base-AGW_R50.yml" +_BASE_: "../Base-AGW.yml" MODEL: HEADS: @@ -18,5 +18,4 @@ SOLVER: TEST: EVAL_PERIOD: 5000 -OUTPUT_DIR: "logs/msmt17/agw" - +OUTPUT_DIR: "logs/msmt17/agw_R50" diff --git a/configs/MSMT17/AGW_S50.yml b/configs/MSMT17/AGW_S50.yml new file mode 100644 index 0000000..1d32eab --- /dev/null +++ b/configs/MSMT17/AGW_S50.yml @@ -0,0 +1,24 @@ +_BASE_: "../Base-AGW.yml" + +MODEL: + BACKBONE: + NAME: "build_resnest_backbone" + + HEADS: + NUM_CLASSES: 1041 + +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/agw_S50" diff --git a/configs/MSMT17/bagtricks_R101-ibn.yml b/configs/MSMT17/bagtricks_R101-ibn.yml index cb4b29f..9a83214 100644 --- a/configs/MSMT17/bagtricks_R101-ibn.yml +++ b/configs/MSMT17/bagtricks_R101-ibn.yml @@ -4,22 +4,23 @@ MODEL: BACKBONE: DEPTH: 101 WITH_IBN: True - PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" HEADS: NUM_CLASSES: 1041 SOLVER: MAX_ITER: 42000 - STEPS: [19000, 33000] - WARMUP_ITERS: 4700 - + CHECKPOINT_PERIOD: 5000 DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -OUTPUT_DIR: "logs/msmt/bagtricks_R101-ibn" +TEST: + EVAL_PERIOD: 5000 + +OUTPUT_DIR: "logs/msmt17/bagtricks_R101-ibn" diff --git a/configs/MSMT17/bagtricks_R50-ibn.yml b/configs/MSMT17/bagtricks_R50-ibn.yml index 3967bd9..f3d9b37 100644 --- a/configs/MSMT17/bagtricks_R50-ibn.yml +++ b/configs/MSMT17/bagtricks_R50-ibn.yml @@ -3,22 +3,23 @@ _BASE_: "../Base-bagtricks.yml" MODEL: BACKBONE: WITH_IBN: True - PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" HEADS: NUM_CLASSES: 1041 SOLVER: MAX_ITER: 42000 - STEPS: [19000, 33000] - WARMUP_ITERS: 4700 - + CHECKPOINT_PERIOD: 5000 DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -OUTPUT_DIR: "logs/msmt/bagtricks_R50-ibn" +TEST: + EVAL_PERIOD: 5000 + +OUTPUT_DIR: "logs/msmt17/bagtricks_R50-ibn" diff --git a/configs/MSMT17/bagtricks_R50.yml b/configs/MSMT17/bagtricks_R50.yml index adca0ac..04bd592 100644 --- a/configs/MSMT17/bagtricks_R50.yml +++ b/configs/MSMT17/bagtricks_R50.yml @@ -6,13 +6,15 @@ MODEL: SOLVER: MAX_ITER: 42000 - STEPS: [19000, 33000] - WARMUP_ITERS: 4700 + CHECKPOINT_PERIOD: 5000 DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -OUTPUT_DIR: "logs/msmt/bagtricks_R50" +TEST: + EVAL_PERIOD: 5000 + +OUTPUT_DIR: "logs/msmt17/bagtricks_R50" diff --git a/configs/MSMT17/bagtricks_S50.yml b/configs/MSMT17/bagtricks_S50.yml index b9e788f..72f822a 100644 --- a/configs/MSMT17/bagtricks_S50.yml +++ b/configs/MSMT17/bagtricks_S50.yml @@ -9,15 +9,16 @@ MODEL: SOLVER: MAX_ITER: 42000 - STEPS: [19000, 33000] - WARMUP_ITERS: 4700 - + CHECKPOINT_PERIOD: 5000 DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -OUTPUT_DIR: "logs/msmt/bagtricks_S50" +TEST: + EVAL_PERIOD: 5000 + +OUTPUT_DIR: "logs/msmt17/bagtricks_S50" diff --git a/configs/MSMT17/sbs.yml b/configs/MSMT17/sbs.yml deleted file mode 100644 index b786920..0000000 --- a/configs/MSMT17/sbs.yml +++ /dev/null @@ -1,29 +0,0 @@ -_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: 1041 - -DATASETS: - NAMES: ("MSMT17",) - TESTS: ("MSMT17",) - - -SOLVER: - MAX_ITER: 29000 - DELAY_ITERS: 14000 - WARMUP_ITERS: 4700 - FREEZE_ITERS: 4700 - - CHECKPOINT_PERIOD: 4000 - -TEST: - EVAL_PERIOD: 4000 - -OUTPUT_DIR: "logs/msmt17/resnest-nl-gem-circle_s64m0.35_loss-cos_delay-autoaug" diff --git a/configs/MSMT17/sbs_R101-ibn.yml b/configs/MSMT17/sbs_R101-ibn.yml new file mode 100644 index 0000000..eb6c24a --- /dev/null +++ b/configs/MSMT17/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: 1041 + +DATASETS: + NAMES: ("MSMT17",) + TESTS: ("MSMT17",) + +SOLVER: + MAX_ITER: 28000 + DELAY_ITERS: 14000 + WARMUP_ITERS: 4700 + FREEZE_ITERS: 4700 + +TEST: + EVAL_PERIOD: 5000 + PRECISE_BN: + DATASET: 'MSMT17' + +OUTPUT_DIR: "logs/msmt17/sbs-R101-ibn" diff --git a/configs/MSMT17/sbs_R50-ibn.yml b/configs/MSMT17/sbs_R50-ibn.yml new file mode 100644 index 0000000..a3872fb --- /dev/null +++ b/configs/MSMT17/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: 1041 + +DATASETS: + NAMES: ("MSMT17",) + TESTS: ("MSMT17",) + +SOLVER: + MAX_ITER: 28000 + DELAY_ITERS: 14000 + WARMUP_ITERS: 4700 + FREEZE_ITERS: 4700 + +TEST: + EVAL_PERIOD: 5000 + PRECISE_BN: + DATASET: 'MSMT17' + +OUTPUT_DIR: "logs/msmt17/sbs_R50-ibn" diff --git a/configs/MSMT17/sbs_R50.yml b/configs/MSMT17/sbs_R50.yml new file mode 100644 index 0000000..3912b50 --- /dev/null +++ b/configs/MSMT17/sbs_R50.yml @@ -0,0 +1,22 @@ +_BASE_: "../Base-Strongerbaseline.yml" + +MODEL: + HEADS: + NUM_CLASSES: 1041 + +DATASETS: + NAMES: ("MSMT17",) + TESTS: ("MSMT17",) + +SOLVER: + MAX_ITER: 28000 + DELAY_ITERS: 14000 + WARMUP_ITERS: 4700 + FREEZE_ITERS: 4700 + +TEST: + EVAL_PERIOD: 5000 + PRECISE_BN: + DATASET: 'MSMT17' + +OUTPUT_DIR: "logs/msmt17/sbs_R50" diff --git a/configs/MSMT17/sbs_S50.yml b/configs/MSMT17/sbs_S50.yml new file mode 100644 index 0000000..2e0f8a9 --- /dev/null +++ b/configs/MSMT17/sbs_S50.yml @@ -0,0 +1,29 @@ +_BASE_: "../Base-Strongerbaseline.yml" + +MODEL: + BACKBONE: + NAME: "build_resnest_backbone" + + HEADS: + NUM_CLASSES: 1041 + + LOSSES: + TRI: + MARGIN: 0.3 + +DATASETS: + NAMES: ("MSMT17",) + TESTS: ("MSMT17",) + +SOLVER: + MAX_ITER: 28000 + DELAY_ITERS: 14000 + WARMUP_ITERS: 4700 + FREEZE_ITERS: 4700 + +TEST: + EVAL_PERIOD: 5000 + PRECISE_BN: + DATASET: 'MSMT17' + +OUTPUT_DIR: "logs/msmt17/sbs_S50" diff --git a/configs/Market1501/AGW_R50-ibn.yml b/configs/Market1501/AGW_R50-ibn.yml index e83cb57..31e3479 100644 --- a/configs/Market1501/AGW_R50-ibn.yml +++ b/configs/Market1501/AGW_R50-ibn.yml @@ -9,12 +9,6 @@ MODEL: HEADS: NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 18000 - - STEPS: [8000, 14000] - - WARMUP_ITERS: 2000 DATASETS: NAMES: ("Market1501",) diff --git a/configs/Market1501/AGW_R50.yml b/configs/Market1501/AGW_R50.yml index f1e54c9..8f1548d 100644 --- a/configs/Market1501/AGW_R50.yml +++ b/configs/Market1501/AGW_R50.yml @@ -4,12 +4,6 @@ MODEL: HEADS: NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 18000 - - STEPS: [8000, 14000] - - WARMUP_ITERS: 2000 DATASETS: NAMES: ("Market1501",) diff --git a/configs/Market1501/AGW_S50.yml b/configs/Market1501/AGW_S50.yml index 9695817..31b4446 100644 --- a/configs/Market1501/AGW_S50.yml +++ b/configs/Market1501/AGW_S50.yml @@ -5,15 +5,9 @@ MODEL: NAME: "build_resnest_backbone" HEADS: + NECK_FEAT: "after" NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 18000 - - STEPS: [8000, 14000] - - WARMUP_ITERS: 2000 - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) diff --git a/configs/Market1501/bagtricks_R101-ibn.yml b/configs/Market1501/bagtricks_R101-ibn.yml index 0a3bda0..3451d79 100644 --- a/configs/Market1501/bagtricks_R101-ibn.yml +++ b/configs/Market1501/bagtricks_R101-ibn.yml @@ -9,12 +9,6 @@ MODEL: HEADS: NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 18000 - - STEPS: [8000, 14000] - - WARMUP_ITERS: 2000 DATASETS: NAMES: ("Market1501",) diff --git a/configs/Market1501/bagtricks_R50-ibn.yml b/configs/Market1501/bagtricks_R50-ibn.yml index 41b17b8..929f717 100644 --- a/configs/Market1501/bagtricks_R50-ibn.yml +++ b/configs/Market1501/bagtricks_R50-ibn.yml @@ -8,12 +8,6 @@ MODEL: HEADS: NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 18000 - - STEPS: [8000, 14000] - - WARMUP_ITERS: 2000 DATASETS: NAMES: ("Market1501",) diff --git a/configs/Market1501/bagtricks_R50.yml b/configs/Market1501/bagtricks_R50.yml index a8d4363..75d5341 100644 --- a/configs/Market1501/bagtricks_R50.yml +++ b/configs/Market1501/bagtricks_R50.yml @@ -4,15 +4,10 @@ MODEL: 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" diff --git a/configs/Market1501/bagtricks_S50.yml b/configs/Market1501/bagtricks_S50.yml index 2caeb30..a8e0c64 100644 --- a/configs/Market1501/bagtricks_S50.yml +++ b/configs/Market1501/bagtricks_S50.yml @@ -7,12 +7,6 @@ MODEL: HEADS: NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 18000 - - STEPS: [8000, 14000] - - WARMUP_ITERS: 2000 DATASETS: NAMES: ("Market1501",) diff --git a/configs/Market1501/sbs_R101-ibn.yml b/configs/Market1501/sbs_R101-ibn.yml index 11e446d..c1f3cb4 100644 --- a/configs/Market1501/sbs_R101-ibn.yml +++ b/configs/Market1501/sbs_R101-ibn.yml @@ -10,13 +10,6 @@ MODEL: HEADS: NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 18000 - - STEPS: [8000, 14000] - - WARMUP_ITERS: 2000 - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) @@ -25,4 +18,4 @@ TEST: PRECISE_BN: DATASET: 'Market1501' -OUTPUT_DIR: "logs/market1501/bagtricks_R101-ibn" +OUTPUT_DIR: "logs/market1501/sbs-R101-ibn" diff --git a/configs/Market1501/sbs_R50-ibn.yml b/configs/Market1501/sbs_R50-ibn.yml index ce11a56..5c2e677 100644 --- a/configs/Market1501/sbs_R50-ibn.yml +++ b/configs/Market1501/sbs_R50-ibn.yml @@ -3,17 +3,11 @@ _BASE_: "../Base-Strongerbaseline.yml" MODEL: BACKBONE: WITH_IBN: True - PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" + PRETRAIN_PATH: "/home/liaoxingyu2/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",) diff --git a/configs/Market1501/sbs_R50.yml b/configs/Market1501/sbs_R50.yml index 8e1f1f4..62cd911 100644 --- a/configs/Market1501/sbs_R50.yml +++ b/configs/Market1501/sbs_R50.yml @@ -4,12 +4,6 @@ MODEL: HEADS: NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 16000 - DELAY_ITERS: 8000 - WARMUP_ITERS: 2600 - FREEZE_ITERS: 2600 - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) diff --git a/configs/Market1501/sbs_S50.yml b/configs/Market1501/sbs_S50.yml index 7aaeee0..15defcb 100644 --- a/configs/Market1501/sbs_S50.yml +++ b/configs/Market1501/sbs_S50.yml @@ -7,11 +7,9 @@ MODEL: HEADS: NUM_CLASSES: 751 -SOLVER: - MAX_ITER: 16000 - DELAY_ITERS: 8000 - WARMUP_ITERS: 2600 - FREEZE_ITERS: 2600 + LOSSES: + TRI: + MARGIN: 0.3 DATASETS: NAMES: ("Market1501",)