From 825da4dca0ccab3c2f304853dc3fc70826263d8e Mon Sep 17 00:00:00 2001 From: liaoxingyu Date: Mon, 6 Jul 2020 16:48:14 +0800 Subject: [PATCH] update all config files --- configs/Base-AGW.yml | 55 +----------------- configs/Base-MGN.yml | 68 +---------------------- configs/Base-Strongerbaseline.yml | 50 ++++------------- configs/Base-bagtricks.yml | 26 ++++----- configs/DukeMTMC/AGW_R101-ibn.yml | 4 -- configs/DukeMTMC/AGW_R50-ibn.yml | 4 -- configs/DukeMTMC/AGW_R50.yml | 5 -- configs/DukeMTMC/AGW_S50.yml | 7 --- configs/DukeMTMC/bagtricks_R101-ibn.yml | 5 +- configs/DukeMTMC/bagtricks_R50-ibn.yml | 3 - configs/DukeMTMC/bagtricks_R50.yml | 5 -- configs/DukeMTMC/bagtricks_S50.yml | 3 - configs/DukeMTMC/mgn_R50-ibn.yml | 4 +- configs/DukeMTMC/sbs_R101-ibn.yml | 11 +--- configs/DukeMTMC/sbs_R50-ibn.yml | 10 +--- configs/DukeMTMC/sbs_R50.yml | 8 --- configs/DukeMTMC/sbs_S50.yml | 11 ---- configs/MSMT17/AGW_R101-ibn.yml | 13 ----- configs/MSMT17/AGW_R50-ibn.yml | 15 +---- configs/MSMT17/AGW_R50.yml | 14 ----- configs/MSMT17/AGW_S50.yml | 17 ------ configs/MSMT17/bagtricks_R101-ibn.yml | 14 +---- configs/MSMT17/bagtricks_R50-ibn.yml | 14 +---- configs/MSMT17/bagtricks_R50.yml | 13 ----- configs/MSMT17/bagtricks_S50.yml | 12 ---- configs/MSMT17/mgn_R50-ibn.yml | 14 ----- configs/MSMT17/mgn_R50.yml | 22 -------- configs/MSMT17/sbs_R101-ibn.yml | 16 +----- configs/MSMT17/sbs_R50-ibn.yml | 16 +----- configs/MSMT17/sbs_R50.yml | 15 ----- configs/MSMT17/sbs_S50.yml | 18 ------ configs/Market1501/AGW_R101-ibn.yml | 6 +- configs/Market1501/AGW_R50-ibn.yml | 5 -- configs/Market1501/AGW_R50.yml | 5 -- configs/Market1501/AGW_S50.yml | 8 --- configs/Market1501/bagtricks_R101-ibn.yml | 4 -- configs/Market1501/bagtricks_R50-ibn.yml | 4 -- configs/Market1501/bagtricks_R50.yml | 6 -- configs/Market1501/bagtricks_S50.yml | 4 -- configs/Market1501/mgn_R50-ibn.yml | 5 +- configs/Market1501/sbs_R101-ibn.yml | 7 --- configs/Market1501/sbs_R50-ibn.yml | 8 --- configs/Market1501/sbs_R50.yml | 8 --- configs/Market1501/sbs_S50.yml | 11 ---- 44 files changed, 42 insertions(+), 531 deletions(-) delete mode 100644 configs/MSMT17/mgn_R50.yml diff --git a/configs/Base-AGW.yml b/configs/Base-AGW.yml index 2d952aa..7d5dcf5 100644 --- a/configs/Base-AGW.yml +++ b/configs/Base-AGW.yml @@ -1,19 +1,11 @@ -MODEL: - META_ARCHITECTURE: 'Baseline' +_BASE_: "Base-bagtricks.yml" +MODEL: BACKBONE: - NAME: "build_resnet_backbone" - DEPTH: 50 - LAST_STRIDE: 1 WITH_NL: True - PRETRAIN: True HEADS: - NAME: "BNneckHead" POOL_LAYER: "gempool" - NECK_FEAT: "before" - CLS_LAYER: "linear" - NUM_CLASSES: 702 LOSSES: NAME: ("CrossEntropyLoss", "TripletLoss") @@ -25,46 +17,3 @@ MODEL: MARGIN: 0.0 HARD_MINING: False SCALE: 1.0 - -DATASETS: - NAMES: ("DukeMTMC",) - TESTS: ("DukeMTMC",) - -INPUT: - SIZE_TRAIN: [256, 128] - SIZE_TEST: [256, 128] - REA: - ENABLED: True - PROB: 0.5 - MEAN: [123.675, 116.28, 103.53] - DO_PAD: True - -DATALOADER: - PK_SAMPLER: True - NUM_INSTANCE: 4 - NUM_WORKERS: 16 - -SOLVER: - OPT: "Adam" - 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, 18000] - GAMMA: 0.1 - - WARMUP_FACTOR: 0.01 - WARMUP_ITERS: 2000 - - LOG_PERIOD: 200 - CHECKPOINT_PERIOD: 6000 - -TEST: - EVAL_PERIOD: 2000 - IMS_PER_BATCH: 256 - -CUDNN_BENCHMARK: True - diff --git a/configs/Base-MGN.yml b/configs/Base-MGN.yml index a5e0317..5227327 100644 --- a/configs/Base-MGN.yml +++ b/configs/Base-MGN.yml @@ -1,27 +1,15 @@ +_BASE_: "Base-Strongerbaseline.yml" + MODEL: META_ARCHITECTURE: 'MGN' - OPEN_LAYERS: ["b1_pool", "b1_head", "b2_pool", "b2_head", "b21_pool", "b21_head", "b22_pool", "b22_head", - "b3_pool", "b3_head", "b31_pool", "b31_head", "b32_pool", "b32_head", "b33_pool", "b33_head"] + FREEZE_LAYERS: ["backbone", "b1", "b2", "b3",] BACKBONE: - NAME: "build_resnet_backbone" - NORM: "BN" - DEPTH: 50 - LAST_STRIDE: 1 - WITH_IBN: False WITH_NL: False - PRETRAIN: True HEADS: - NAME: "BNneckHead" - NORM: "BN" - NECK_FEAT: "after" - CLS_LAYER: "circle" - POOL_LAYER: "gempool" IN_FEAT: 256 - SCALE: 64 - MARGIN: 0.35 LOSSES: NAME: ("CrossEntropyLoss", "TripletLoss",) @@ -35,53 +23,3 @@ MODEL: NORM_FEAT: False SCALE: 0.20 -DATASETS: - NAMES: ("DukeMTMC",) - TESTS: ("DukeMTMC",) - -INPUT: - SIZE_TRAIN: [384, 128] - SIZE_TEST: [384, 128] - DO_AUTOAUG: True - REA: - ENABLED: True - PROB: 0.5 - MEAN: [123.675, 116.28, 103.53] - DO_PAD: True - -DATALOADER: - PK_SAMPLER: True - NUM_INSTANCE: 16 - NUM_WORKERS: 16 - -SOLVER: - OPT: "Adam" - MAX_ITER: 18000 - BASE_LR: 0.00035 - BIAS_LR_FACTOR: 2. - WEIGHT_DECAY: 0.0005 - WEIGHT_DECAY_BIAS: 0.0 - IMS_PER_BATCH: 64 - - SCHED: "DelayedCosineAnnealingLR" - - DELAY_ITERS: 9000 - ETA_MIN_LR: 0.00000077 - - WARMUP_FACTOR: 0.01 - WARMUP_ITERS: 2000 - - FREEZE_ITERS: 2000 - - LOG_PERIOD: 200 - CHECKPOINT_PERIOD: 6000 - -TEST: - EVAL_PERIOD: 2000 - IMS_PER_BATCH: 256 - PRECISE_BN: - ENABLED: False - DATASET: 'DukeMTMC' - -CUDNN_BENCHMARK: True - diff --git a/configs/Base-Strongerbaseline.yml b/configs/Base-Strongerbaseline.yml index f68310c..7cebdd0 100644 --- a/configs/Base-Strongerbaseline.yml +++ b/configs/Base-Strongerbaseline.yml @@ -1,23 +1,15 @@ -MODEL: - META_ARCHITECTURE: 'Baseline' +_BASE_: "Base-bagtricks.yml" - OPEN_LAYERS: ["heads"] +MODEL: + FREEZE_LAYERS: ["backbone"] BACKBONE: - NAME: "build_resnet_backbone" - NORM: "BN" - DEPTH: 50 - LAST_STRIDE: 1 - WITH_IBN: False WITH_NL: True - PRETRAIN: True HEADS: - NAME: "BNneckHead" - NORM: "BN" NECK_FEAT: "after" - CLS_LAYER: "circle" POOL_LAYER: "gempool" + CLS_LAYER: "circle" SCALE: 64 MARGIN: 0.35 @@ -26,60 +18,42 @@ MODEL: CE: EPSILON: 0.1 SCALE: 1.0 - TRI: MARGIN: 0.0 HARD_MINING: True NORM_FEAT: False SCALE: 1.0 -DATASETS: - NAMES: ("DukeMTMC",) - TESTS: ("DukeMTMC",) - INPUT: SIZE_TRAIN: [384, 128] SIZE_TEST: [384, 128] DO_AUTOAUG: True - REA: - ENABLED: True - PROB: 0.5 - MEAN: [123.675, 116.28, 103.53] - DO_PAD: True DATALOADER: - PK_SAMPLER: True NUM_INSTANCE: 16 - NUM_WORKERS: 16 SOLVER: OPT: "Adam" - MAX_ITER: 18000 + MAX_ITER: 60 BASE_LR: 0.00035 BIAS_LR_FACTOR: 1. WEIGHT_DECAY: 0.0005 WEIGHT_DECAY_BIAS: 0.0005 IMS_PER_BATCH: 64 - SCHED: "DelayedCosineAnnealingLR" - - DELAY_ITERS: 9000 + SCHED: "WarmupCosineAnnealingLR" + DELAY_ITERS: 30 ETA_MIN_LR: 0.00000077 WARMUP_FACTOR: 0.01 - WARMUP_ITERS: 2000 + WARMUP_ITERS: 10 + FREEZE_ITERS: 10 - FREEZE_ITERS: 2000 - - LOG_PERIOD: 200 - CHECKPOINT_PERIOD: 6000 + CHECKPOINT_PERIOD: 30 TEST: - EVAL_PERIOD: 2000 - IMS_PER_BATCH: 256 - PRECISE_BN: - ENABLED: False - DATASET: 'DukeMTMC' + EVAL_PERIOD: 30 + IMS_PER_BATCH: 128 CUDNN_BENCHMARK: True diff --git a/configs/Base-bagtricks.yml b/configs/Base-bagtricks.yml index 7d591ef..ee01d1b 100644 --- a/configs/Base-bagtricks.yml +++ b/configs/Base-bagtricks.yml @@ -12,11 +12,12 @@ MODEL: HEADS: NAME: "BNneckHead" NORM: "BN" + POOL_LAYER: "avgpool" NECK_FEAT: "before" CLS_LAYER: "linear" LOSSES: - NAME: ("CrossEntropyLoss", "TripletLoss", ) + NAME: ("CrossEntropyLoss", "TripletLoss",) CE: EPSILON: 0.1 @@ -25,12 +26,9 @@ MODEL: TRI: MARGIN: 0.3 HARD_MINING: True + NORM_FEAT: False SCALE: 1. -DATASETS: - NAMES: ("DukeMTMC",) - TESTS: ("DukeMTMC",) - INPUT: SIZE_TRAIN: [256, 128] SIZE_TEST: [256, 128] @@ -40,33 +38,33 @@ INPUT: MEAN: [123.675, 116.28, 103.53] DO_PAD: True - DATALOADER: PK_SAMPLER: True + NAIVE_WAY: True NUM_INSTANCE: 4 - NUM_WORKERS: 16 + NUM_WORKERS: 8 SOLVER: OPT: "Adam" - MAX_ITER: 24000 + MAX_ITER: 120 BASE_LR: 0.00035 BIAS_LR_FACTOR: 2. WEIGHT_DECAY: 0.0005 WEIGHT_DECAY_BIAS: 0.0005 IMS_PER_BATCH: 64 - STEPS: [8000, 18000] + SCHED: "WarmupMultiStepLR" + STEPS: [40, 90] GAMMA: 0.1 WARMUP_FACTOR: 0.01 - WARMUP_ITERS: 2000 + WARMUP_ITERS: 10 - LOG_PERIOD: 200 - CHECKPOINT_PERIOD: 2000 + CHECKPOINT_PERIOD: 60 TEST: - EVAL_PERIOD: 2000 - IMS_PER_BATCH: 256 + EVAL_PERIOD: 30 + IMS_PER_BATCH: 128 CUDNN_BENCHMARK: True diff --git a/configs/DukeMTMC/AGW_R101-ibn.yml b/configs/DukeMTMC/AGW_R101-ibn.yml index 185fa55..1b4766e 100644 --- a/configs/DukeMTMC/AGW_R101-ibn.yml +++ b/configs/DukeMTMC/AGW_R101-ibn.yml @@ -2,14 +2,10 @@ _BASE_: "../Base-AGW.yml" MODEL: BACKBONE: - NAME: "build_resnet_backbone" DEPTH: 101 WITH_IBN: True PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" - HEADS: - NUM_CLASSES: 702 - DATASETS: NAMES: ("DukeMTMC",) TESTS: ("DukeMTMC",) diff --git a/configs/DukeMTMC/AGW_R50-ibn.yml b/configs/DukeMTMC/AGW_R50-ibn.yml index f4cd54a..cd021a2 100644 --- a/configs/DukeMTMC/AGW_R50-ibn.yml +++ b/configs/DukeMTMC/AGW_R50-ibn.yml @@ -2,13 +2,9 @@ _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",) diff --git a/configs/DukeMTMC/AGW_R50.yml b/configs/DukeMTMC/AGW_R50.yml index bf3ecc7..c2cceb8 100644 --- a/configs/DukeMTMC/AGW_R50.yml +++ b/configs/DukeMTMC/AGW_R50.yml @@ -1,10 +1,5 @@ _BASE_: "../Base-AGW.yml" -MODEL: - HEADS: - NUM_CLASSES: 702 - - DATASETS: NAMES: ("DukeMTMC",) TESTS: ("DukeMTMC",) diff --git a/configs/DukeMTMC/AGW_S50.yml b/configs/DukeMTMC/AGW_S50.yml index 8bb4bde..f166d6e 100644 --- a/configs/DukeMTMC/AGW_S50.yml +++ b/configs/DukeMTMC/AGW_S50.yml @@ -4,13 +4,6 @@ MODEL: BACKBONE: NAME: "build_resnest_backbone" - HEADS: - NUM_CLASSES: 702 - - LOSSES: - TRI: - MARGIN: 0.3 - DATASETS: NAMES: ("DukeMTMC",) TESTS: ("DukeMTMC",) diff --git a/configs/DukeMTMC/bagtricks_R101-ibn.yml b/configs/DukeMTMC/bagtricks_R101-ibn.yml index 8a9db42..6e0bc9a 100644 --- a/configs/DukeMTMC/bagtricks_R101-ibn.yml +++ b/configs/DukeMTMC/bagtricks_R101-ibn.yml @@ -4,10 +4,7 @@ MODEL: BACKBONE: DEPTH: 101 WITH_IBN: True - PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" - - HEADS: - NUM_CLASSES: 702 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" DATASETS: NAMES: ("DukeMTMC",) diff --git a/configs/DukeMTMC/bagtricks_R50-ibn.yml b/configs/DukeMTMC/bagtricks_R50-ibn.yml index d9c0ebe..9c51ab9 100644 --- a/configs/DukeMTMC/bagtricks_R50-ibn.yml +++ b/configs/DukeMTMC/bagtricks_R50-ibn.yml @@ -5,9 +5,6 @@ MODEL: 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",) diff --git a/configs/DukeMTMC/bagtricks_R50.yml b/configs/DukeMTMC/bagtricks_R50.yml index f487215..c564e99 100644 --- a/configs/DukeMTMC/bagtricks_R50.yml +++ b/configs/DukeMTMC/bagtricks_R50.yml @@ -1,10 +1,5 @@ _BASE_: "../Base-bagtricks.yml" -MODEL: - HEADS: - NUM_CLASSES: 702 - - DATASETS: NAMES: ("DukeMTMC",) TESTS: ("DukeMTMC",) diff --git a/configs/DukeMTMC/bagtricks_S50.yml b/configs/DukeMTMC/bagtricks_S50.yml index cd551cc..03735e8 100644 --- a/configs/DukeMTMC/bagtricks_S50.yml +++ b/configs/DukeMTMC/bagtricks_S50.yml @@ -4,9 +4,6 @@ MODEL: BACKBONE: NAME: "build_resnest_backbone" - HEADS: - NUM_CLASSES: 702 - DATASETS: NAMES: ("DukeMTMC",) TESTS: ("DukeMTMC",) diff --git a/configs/DukeMTMC/mgn_R50-ibn.yml b/configs/DukeMTMC/mgn_R50-ibn.yml index 81a335d..2d8f6fb 100644 --- a/configs/DukeMTMC/mgn_R50-ibn.yml +++ b/configs/DukeMTMC/mgn_R50-ibn.yml @@ -2,13 +2,11 @@ _BASE_: "../Base-MGN.yml" MODEL: 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/mgn_R50-ibn" diff --git a/configs/DukeMTMC/sbs_R101-ibn.yml b/configs/DukeMTMC/sbs_R101-ibn.yml index 4a51452..10d26b5 100644 --- a/configs/DukeMTMC/sbs_R101-ibn.yml +++ b/configs/DukeMTMC/sbs_R101-ibn.yml @@ -4,17 +4,10 @@ MODEL: BACKBONE: DEPTH: 101 WITH_IBN: True - PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" - - HEADS: - NUM_CLASSES: 702 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" DATASETS: NAMES: ("DukeMTMC",) TESTS: ("DukeMTMC",) -TEST: - PRECISE_BN: - DATASET: 'DukeMTMC' - -OUTPUT_DIR: "logs/dukemtmc/sbs-R101-ibn" +OUTPUT_DIR: "logs/dukemtmc/sbs_R101-ibn" diff --git a/configs/DukeMTMC/sbs_R50-ibn.yml b/configs/DukeMTMC/sbs_R50-ibn.yml index 948eb4a..8b6cd87 100644 --- a/configs/DukeMTMC/sbs_R50-ibn.yml +++ b/configs/DukeMTMC/sbs_R50-ibn.yml @@ -3,18 +3,10 @@ _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 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" 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 index cc35b5f..b568f8d 100644 --- a/configs/DukeMTMC/sbs_R50.yml +++ b/configs/DukeMTMC/sbs_R50.yml @@ -1,15 +1,7 @@ _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 index be861aa..1074d86 100644 --- a/configs/DukeMTMC/sbs_S50.yml +++ b/configs/DukeMTMC/sbs_S50.yml @@ -4,19 +4,8 @@ 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_R101-ibn.yml b/configs/MSMT17/AGW_R101-ibn.yml index 0ccae22..5283ba5 100644 --- a/configs/MSMT17/AGW_R101-ibn.yml +++ b/configs/MSMT17/AGW_R101-ibn.yml @@ -6,21 +6,8 @@ MODEL: WITH_IBN: True PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_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_R101-ibn" diff --git a/configs/MSMT17/AGW_R50-ibn.yml b/configs/MSMT17/AGW_R50-ibn.yml index 5bf2efb..fb57808 100644 --- a/configs/MSMT17/AGW_R50-ibn.yml +++ b/configs/MSMT17/AGW_R50-ibn.yml @@ -3,23 +3,10 @@ _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 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" 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_R50.yml b/configs/MSMT17/AGW_R50.yml index f9d5c18..a43e32f 100644 --- a/configs/MSMT17/AGW_R50.yml +++ b/configs/MSMT17/AGW_R50.yml @@ -1,21 +1,7 @@ _BASE_: "../Base-AGW.yml" -MODEL: - 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" diff --git a/configs/MSMT17/AGW_S50.yml b/configs/MSMT17/AGW_S50.yml index 677d7d6..8ec8ccb 100644 --- a/configs/MSMT17/AGW_S50.yml +++ b/configs/MSMT17/AGW_S50.yml @@ -4,25 +4,8 @@ MODEL: BACKBONE: NAME: "build_resnest_backbone" - HEADS: - NUM_CLASSES: 1041 - - LOSSES: - TRI: - MARGIN: 0.3 - 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 9a83214..ba86d24 100644 --- a/configs/MSMT17/bagtricks_R101-ibn.yml +++ b/configs/MSMT17/bagtricks_R101-ibn.yml @@ -4,23 +4,11 @@ MODEL: BACKBONE: DEPTH: 101 WITH_IBN: True - 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 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -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 f3d9b37..563d48e 100644 --- a/configs/MSMT17/bagtricks_R50-ibn.yml +++ b/configs/MSMT17/bagtricks_R50-ibn.yml @@ -3,23 +3,11 @@ _BASE_: "../Base-bagtricks.yml" MODEL: BACKBONE: WITH_IBN: True - 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 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -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 04bd592..313e93e 100644 --- a/configs/MSMT17/bagtricks_R50.yml +++ b/configs/MSMT17/bagtricks_R50.yml @@ -1,20 +1,7 @@ _BASE_: "../Base-bagtricks.yml" -MODEL: - HEADS: - NUM_CLASSES: 1041 - -SOLVER: - MAX_ITER: 42000 - STEPS: [19000, 33000] - WARMUP_ITERS: 4700 - CHECKPOINT_PERIOD: 5000 - DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -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 72f822a..b855bfd 100644 --- a/configs/MSMT17/bagtricks_S50.yml +++ b/configs/MSMT17/bagtricks_S50.yml @@ -4,21 +4,9 @@ MODEL: BACKBONE: NAME: "build_resnest_backbone" - HEADS: - NUM_CLASSES: 1041 - -SOLVER: - MAX_ITER: 42000 - STEPS: [19000, 33000] - WARMUP_ITERS: 4700 - CHECKPOINT_PERIOD: 5000 - DATASETS: NAMES: ("MSMT17",) TESTS: ("MSMT17",) -TEST: - EVAL_PERIOD: 5000 - OUTPUT_DIR: "logs/msmt17/bagtricks_S50" diff --git a/configs/MSMT17/mgn_R50-ibn.yml b/configs/MSMT17/mgn_R50-ibn.yml index 4e9c31c..303371f 100644 --- a/configs/MSMT17/mgn_R50-ibn.yml +++ b/configs/MSMT17/mgn_R50-ibn.yml @@ -5,22 +5,8 @@ MODEL: WITH_IBN: 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: 28000 - DELAY_ITERS: 14000 - WARMUP_ITERS: 4700 - FREEZE_ITERS: 4700 - -TEST: - EVAL_PERIOD: 5000 - PRECISE_BN: - DATASET: 'MSMT17' - OUTPUT_DIR: "logs/msmt17/mgn_R50-ibn" diff --git a/configs/MSMT17/mgn_R50.yml b/configs/MSMT17/mgn_R50.yml deleted file mode 100644 index f028472..0000000 --- a/configs/MSMT17/mgn_R50.yml +++ /dev/null @@ -1,22 +0,0 @@ -_BASE_: "../Base-MGN.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/mgn_R50" diff --git a/configs/MSMT17/sbs_R101-ibn.yml b/configs/MSMT17/sbs_R101-ibn.yml index a34e615..527152b 100644 --- a/configs/MSMT17/sbs_R101-ibn.yml +++ b/configs/MSMT17/sbs_R101-ibn.yml @@ -4,24 +4,10 @@ MODEL: BACKBONE: DEPTH: 101 WITH_IBN: True - PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" - - HEADS: - NUM_CLASSES: 1041 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" 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 index a3872fb..64cb29d 100644 --- a/configs/MSMT17/sbs_R50-ibn.yml +++ b/configs/MSMT17/sbs_R50-ibn.yml @@ -3,24 +3,10 @@ _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 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" 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 index 3912b50..e0ed26e 100644 --- a/configs/MSMT17/sbs_R50.yml +++ b/configs/MSMT17/sbs_R50.yml @@ -1,22 +1,7 @@ _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 index 2e0f8a9..e6ca1b0 100644 --- a/configs/MSMT17/sbs_S50.yml +++ b/configs/MSMT17/sbs_S50.yml @@ -4,26 +4,8 @@ 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_R101-ibn.yml b/configs/Market1501/AGW_R101-ibn.yml index b0206aa..afe2020 100644 --- a/configs/Market1501/AGW_R101-ibn.yml +++ b/configs/Market1501/AGW_R101-ibn.yml @@ -2,13 +2,9 @@ _BASE_: "../Base-AGW.yml" MODEL: BACKBONE: - NAME: "build_resnet_backbone" DEPTH: 101 WITH_IBN: True - PRETRAIN_PATH: "/export/home/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" - - HEADS: - NUM_CLASSES: 751 + PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" DATASETS: NAMES: ("Market1501",) diff --git a/configs/Market1501/AGW_R50-ibn.yml b/configs/Market1501/AGW_R50-ibn.yml index 31e3479..bee96c1 100644 --- a/configs/Market1501/AGW_R50-ibn.yml +++ b/configs/Market1501/AGW_R50-ibn.yml @@ -2,14 +2,9 @@ _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 - - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) diff --git a/configs/Market1501/AGW_R50.yml b/configs/Market1501/AGW_R50.yml index 8f1548d..99af757 100644 --- a/configs/Market1501/AGW_R50.yml +++ b/configs/Market1501/AGW_R50.yml @@ -1,10 +1,5 @@ _BASE_: "../Base-AGW.yml" -MODEL: - HEADS: - NUM_CLASSES: 751 - - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) diff --git a/configs/Market1501/AGW_S50.yml b/configs/Market1501/AGW_S50.yml index 833de77..ff870bd 100644 --- a/configs/Market1501/AGW_S50.yml +++ b/configs/Market1501/AGW_S50.yml @@ -4,14 +4,6 @@ MODEL: BACKBONE: NAME: "build_resnest_backbone" - HEADS: - NECK_FEAT: "before" - NUM_CLASSES: 751 - - LOSSES: - TRI: - MARGIN: 0.3 - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) diff --git a/configs/Market1501/bagtricks_R101-ibn.yml b/configs/Market1501/bagtricks_R101-ibn.yml index 3451d79..5103391 100644 --- a/configs/Market1501/bagtricks_R101-ibn.yml +++ b/configs/Market1501/bagtricks_R101-ibn.yml @@ -6,10 +6,6 @@ MODEL: WITH_IBN: True PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" - HEADS: - NUM_CLASSES: 751 - - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) diff --git a/configs/Market1501/bagtricks_R50-ibn.yml b/configs/Market1501/bagtricks_R50-ibn.yml index 929f717..d8f0cf6 100644 --- a/configs/Market1501/bagtricks_R50-ibn.yml +++ b/configs/Market1501/bagtricks_R50-ibn.yml @@ -5,10 +5,6 @@ MODEL: WITH_IBN: True PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" - HEADS: - NUM_CLASSES: 751 - - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) diff --git a/configs/Market1501/bagtricks_R50.yml b/configs/Market1501/bagtricks_R50.yml index 75d5341..d814d8c 100644 --- a/configs/Market1501/bagtricks_R50.yml +++ b/configs/Market1501/bagtricks_R50.yml @@ -1,13 +1,7 @@ _BASE_: "../Base-bagtricks.yml" -MODEL: - HEADS: - NUM_CLASSES: 751 - - 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 a8e0c64..69f51c7 100644 --- a/configs/Market1501/bagtricks_S50.yml +++ b/configs/Market1501/bagtricks_S50.yml @@ -4,10 +4,6 @@ MODEL: BACKBONE: NAME: "build_resnest_backbone" - HEADS: - NUM_CLASSES: 751 - - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) diff --git a/configs/Market1501/mgn_R50-ibn.yml b/configs/Market1501/mgn_R50-ibn.yml index 6fab909..058ca12 100644 --- a/configs/Market1501/mgn_R50-ibn.yml +++ b/configs/Market1501/mgn_R50-ibn.yml @@ -2,13 +2,12 @@ _BASE_: "../Base-MGN.yml" MODEL: BACKBONE: + WITH_IBN: True PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" - HEADS: - NUM_CLASSES: 751 DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) -OUTPUT_DIR: "logs/market/mgn_R50-ibn" +OUTPUT_DIR: "logs/market1501/mgn_R50-ibn" diff --git a/configs/Market1501/sbs_R101-ibn.yml b/configs/Market1501/sbs_R101-ibn.yml index d834934..84348f6 100644 --- a/configs/Market1501/sbs_R101-ibn.yml +++ b/configs/Market1501/sbs_R101-ibn.yml @@ -6,15 +6,8 @@ MODEL: WITH_IBN: True PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet101_ibn_a.pth.tar" - HEADS: - NUM_CLASSES: 751 - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) -TEST: - PRECISE_BN: - DATASET: 'Market1501' - OUTPUT_DIR: "logs/market1501/sbs-R101-ibn" diff --git a/configs/Market1501/sbs_R50-ibn.yml b/configs/Market1501/sbs_R50-ibn.yml index 5c2e677..4b556a0 100644 --- a/configs/Market1501/sbs_R50-ibn.yml +++ b/configs/Market1501/sbs_R50-ibn.yml @@ -5,16 +5,8 @@ MODEL: WITH_IBN: True PRETRAIN_PATH: "/home/liaoxingyu2/lxy/.cache/torch/checkpoints/resnet50_ibn_a.pth.tar" - HEADS: - NUM_CLASSES: 751 - 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 index 62cd911..2f50564 100644 --- a/configs/Market1501/sbs_R50.yml +++ b/configs/Market1501/sbs_R50.yml @@ -1,15 +1,7 @@ _BASE_: "../Base-Strongerbaseline.yml" -MODEL: - HEADS: - NUM_CLASSES: 751 - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) -TEST: - PRECISE_BN: - DATASET: 'Market1501' - OUTPUT_DIR: "logs/market1501/sbs_R50" diff --git a/configs/Market1501/sbs_S50.yml b/configs/Market1501/sbs_S50.yml index 15defcb..332d156 100644 --- a/configs/Market1501/sbs_S50.yml +++ b/configs/Market1501/sbs_S50.yml @@ -4,19 +4,8 @@ MODEL: BACKBONE: NAME: "build_resnest_backbone" - HEADS: - NUM_CLASSES: 751 - - LOSSES: - TRI: - MARGIN: 0.3 - DATASETS: NAMES: ("Market1501",) TESTS: ("Market1501",) -TEST: - PRECISE_BN: - DATASET: 'Market1501' - OUTPUT_DIR: "logs/market1501/sbs_S50"