Added and updated CFC baseline configs

justinkay · Sep 19, 2023 · ea3975d · ea3975d
1 parent db5d172
commit ea3975d
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 6 deletions.
diff --git a/configs/Base-RCNN-FPN.yaml b/configs/Base-RCNN-FPN.yaml
@@ -1,7 +1,7 @@
 _BASE_: "detectron2/Base-RCNN-FPN.yaml"
 MODEL:
   META_ARCHITECTURE: "DARCNN"
-  WEIGHTS: "models/model_final_f10217.pkl"
+  WEIGHTS: "detectron2://COCO-InstanceSegmentation/mask_rcnn_R_50_FPN_3x/137849600/model_final_f10217.pkl" #"models/model_final_f10217.pkl"
   MASK_ON: False
 INPUT:
   MIN_SIZE_TRAIN: (800, 832, 864, 896, 928, 960, 992, 1024)

diff --git a/configs/cfc/cfc_baseline/Base-RCNN-FPN-CFC_strongaug_ema.yaml b/configs/cfc/cfc_baseline/Base-RCNN-FPN-CFC_strongaug_ema.yaml
@@ -3,4 +3,7 @@ DATASETS:
   BATCH_CONTENTS: ("labeled_strong", )
 EMA:
   ENABLED: True
+SOLVER:
+  STEPS: (18000,)
+  MAX_ITER: 20000
 OUTPUT_DIR: "output/cfc/cfc_baseline_strongaug_ema/"
diff --git a/configs/cfc/cfc_baseline/Base-RCNN-FPN-CFC_strongaug_ema_mic.yaml b/configs/cfc/cfc_baseline/Base-RCNN-FPN-CFC_strongaug_ema_mic.yaml
@@ -6,4 +6,7 @@ EMA:
 AUG:
   INCLUDE_RANDOM_ERASING: False
   LABELED_MIC_AUG: True
-OUTPUT_DIR: "output/cfc/cfc_baseline_strongaug_ema/"
+SOLVER:
+  STEPS: (18000,)
+  MAX_ITER: 20000
+OUTPUT_DIR: "output/cfc/cfc_baseline_strongaug_ema_mic/"
diff --git a/configs/cfc/cfc_oracle_st/OracleST-RCNN-FPN-CFC.yaml b/configs/cfc/cfc_oracle_st/OracleST-RCNN-FPN-CFC.yaml
@@ -0,0 +1,16 @@
+_BASE_: "../../Base-RCNN-FPN.yaml"
+MODEL:
+  ROI_HEADS:
+    NUM_CLASSES: 1
+DATASETS:
+  TRAIN: ("cfc_train", "cfc_channel_train",)
+  TEST: ("cfc_val", "cfc_channel_test",)
+OUTPUT_DIR: "output/cfc/cfc_oracle_st/"
+
+# rough numbers -- don't correspond to any specific number of epochs, just checking how we do
+SOLVER:
+  STEPS: (10000,)
+  MAX_ITER: 12000
+  CHECKPOINT_PERIOD: 3000
+TEST:
+  EVAL_PERIOD: 1250
diff --git a/configs/cfc/cfc_oracle_st/OracleST-RCNN-FPN-CFC_strongaug_ema.yaml b/configs/cfc/cfc_oracle_st/OracleST-RCNN-FPN-CFC_strongaug_ema.yaml
@@ -0,0 +1,9 @@
+_BASE_: "./OracleST-RCNN-FPN-CFC.yaml"
+DATASETS:
+  BATCH_CONTENTS: ("labeled_strong", )
+EMA:
+  ENABLED: True
+SOLVER:
+  STEPS: (18000,)
+  MAX_ITER: 20000
+OUTPUT_DIR: "output/cfc/cfc_oracle_st_strongaug_ema/"
diff --git a/configs/cfc/cfc_oracle_st/OracleST-RCNN-FPN-CFC_strongaug_ema_mic.yaml b/configs/cfc/cfc_oracle_st/OracleST-RCNN-FPN-CFC_strongaug_ema_mic.yaml
@@ -0,0 +1,12 @@
+_BASE_: "./OracleST-RCNN-FPN-CFC.yaml"
+DATASETS:
+  BATCH_CONTENTS: ("labeled_strong", )
+EMA:
+  ENABLED: True
+AUG:
+  INCLUDE_RANDOM_ERASING: False
+  LABELED_MIC_AUG: True
+SOLVER:
+  STEPS: (18000,)
+  MAX_ITER: 20000
+OUTPUT_DIR: "output/cfc/cfc_oracle_st_strongaug_ema_mic/"
diff --git a/...acle_t/OracleT-FPN-CFC_strongaug_ema.yaml → ...t/OracleT-RCNN-FPN-CFC_strongaug_ema.yaml b/...acle_t/OracleT-FPN-CFC_strongaug_ema.yaml → ...t/OracleT-RCNN-FPN-CFC_strongaug_ema.yaml
@@ -3,4 +3,7 @@ DATASETS:
   BATCH_CONTENTS: ("labeled_strong", )
 EMA:
   ENABLED: True
+SOLVER:
+  STEPS: (18000,)
+  MAX_ITER: 20000
 OUTPUT_DIR: "output/cfc/cfc_oraclet_strongaug_ema/"
diff --git a/..._t/OracleT-FPN-CFC_strongaug_ema_mic.yaml → ...acleT-RCNN-FPN-CFC_strongaug_ema_mic.yaml b/..._t/OracleT-FPN-CFC_strongaug_ema_mic.yaml → ...acleT-RCNN-FPN-CFC_strongaug_ema_mic.yaml
@@ -6,4 +6,7 @@ EMA:
 AUG:
   INCLUDE_RANDOM_ERASING: False
   LABELED_MIC_AUG: True
+SOLVER:
+  STEPS: (18000,)
+  MAX_ITER: 20000
 OUTPUT_DIR: "output/cfc/cfc_oraclet_strongaug_ema/"
diff --git a/configs/sim10k/sim10k_baseline/Base-RCNN-FPN-Sim10k.yaml b/configs/sim10k/sim10k_baseline/Base-RCNN-FPN-Sim10k.yaml
@@ -9,8 +9,7 @@ OUTPUT_DIR: "output/sim10k/sim10k_baseline/"
 
 # to start, try: double compared to Cityscapes train
 SOLVER:
-  STEPS: (3000,) #(18000,)
-  MAX_ITER: 5000 #24000
-  CHECKPOINT_PERIOD: 3000
+  STEPS: (800,) #(18000,)
+  MAX_ITER: 1000 #5000 #24000
 TEST:
-  EVAL_PERIOD: 312 # evaluate sooner; with 612 the best model was the first one
+  EVAL_PERIOD: 165 # evaluate sooner; with 312, 625 the best model was the first one