Merge pull request #294 from yoshitomo-matsubara/dev

Rename loss-related classes and functions
yoshitomo-matsubara · Mar 24, 2023 · a24d70c · a24d70c
2 parents a016d1e + 4b442d2
commit a24d70c
Show file tree

Hide file tree

Showing 124 changed files with 162 additions and 159 deletions.
diff --git a/...-matsubara/rrpr2020/ghnd-custom_fasterrcnn_resnet50_fpn_from_fasterrcnn_resnet50_fpn.yaml b/...-matsubara/rrpr2020/ghnd-custom_fasterrcnn_resnet50_fpn_from_fasterrcnn_resnet50_fpn.yaml
@@ -106,7 +106,7 @@ train:
       milestones: [5, 15]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       factor: 0.0
     sub_terms:

diff --git a/...tomo-matsubara/rrpr2020/ghnd-custom_maskrcnn_resnet50_fpn_from_maskrcnn_resnet50_fpn.yaml b/...tomo-matsubara/rrpr2020/ghnd-custom_maskrcnn_resnet50_fpn_from_maskrcnn_resnet50_fpn.yaml
@@ -106,7 +106,7 @@ train:
       milestones: [5, 15]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       factor: 0.0
     sub_terms:

diff --git a/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/at-resnet18_from_resnet34.yaml b/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/at-resnet18_from_resnet34.yaml
@@ -95,7 +95,7 @@ train:
       milestones: [30, 60, 90]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/crd-resnet18_from_resnet34.yaml b/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/crd-resnet18_from_resnet34.yaml
@@ -121,7 +121,7 @@ train:
       milestones: [30, 60, 90]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/cse_l2-resnet18_from_resnet34.yaml b/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/cse_l2-resnet18_from_resnet34.yaml
@@ -95,7 +95,7 @@ train:
       milestones: [30, 60]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/ft-resnet18_from_resnet34.yaml b/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/ft-resnet18_from_resnet34.yaml
@@ -109,7 +109,7 @@ train:
         momentum: 0.9
         weight_decay: 0.0001
     criterion:
-      type: 'GeneralizedCustomLoss'
+      type: 'WeightedSumLoss'
       org_term:
         factor: 0.0
       sub_terms:
@@ -183,7 +183,7 @@ train:
         milestones: [30, 60, 90]
         gamma: 0.1
     criterion:
-      type: 'GeneralizedCustomLoss'
+      type: 'WeightedSumLoss'
       org_term:
         criterion:
           type: 'CrossEntropyLoss'

diff --git a/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/kd-resnet18_from_resnet34.yaml b/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/kd-resnet18_from_resnet34.yaml
@@ -89,7 +89,7 @@ train:
       milestones: [30, 60, 90]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'KDLoss'

diff --git a/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/pad_l2-resnet18_from_resnet34.yaml b/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/pad_l2-resnet18_from_resnet34.yaml
@@ -104,7 +104,7 @@ train:
         milestones: [30]
         gamma: 0.1
     criterion:
-      type: 'GeneralizedCustomLoss'
+      type: 'WeightedSumLoss'
       org_term:
         criterion:
           type: 'CrossEntropyLoss'

diff --git a/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/sskd-resnet18_from_resnet34.yaml b/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/sskd-resnet18_from_resnet34.yaml
@@ -111,7 +111,7 @@ train:
         milestones: [10, 20]
         gamma: 0.1
     criterion:
-      type: 'GeneralizedCustomLoss'
+      type: 'WeightedSumLoss'
       org_term:
         factor: 0.0
       sub_terms:
@@ -171,7 +171,7 @@ train:
         milestones: [30, 60, 90]
         gamma: 0.1
     criterion:
-      type: 'GeneralizedCustomLoss'
+      type: 'WeightedSumLoss'
       org_term:
         factor: 0.0
       sub_terms:

diff --git a/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/tfkd-resnet18_from_resnet18.yaml b/configs/official/ilsvrc2012/yoshitomo-matsubara/rrpr2020/tfkd-resnet18_from_resnet18.yaml
@@ -89,7 +89,7 @@ train:
       milestones: [30, 60, 80]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'KDLoss'

diff --git a/configs/sample/cifar10/ce/densenet_bc_k12_depth100-final_run.yaml b/configs/sample/cifar10/ce/densenet_bc_k12_depth100-final_run.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/densenet_bc_k12_depth100-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/densenet_bc_k12_depth100-hyperparameter_tuning.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/densenet_bc_k24_depth250-final_run.yaml b/configs/sample/cifar10/ce/densenet_bc_k24_depth250-final_run.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/densenet_bc_k24_depth250-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/densenet_bc_k24_depth250-hyperparameter_tuning.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/densenet_bc_k40_depth190-final_run.yaml b/configs/sample/cifar10/ce/densenet_bc_k40_depth190-final_run.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/densenet_bc_k40_depth190-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/densenet_bc_k40_depth190-hyperparameter_tuning.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet110-final_run.yaml b/configs/sample/cifar10/ce/resnet110-final_run.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet110-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/resnet110-hyperparameter_tuning.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet1202-final_run.yaml b/configs/sample/cifar10/ce/resnet1202-final_run.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet1202-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/resnet1202-hyperparameter_tuning.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet20-final_run.yaml b/configs/sample/cifar10/ce/resnet20-final_run.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet20-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/resnet20-hyperparameter_tuning.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet32-final_run.yaml b/configs/sample/cifar10/ce/resnet32-final_run.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet32-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/resnet32-hyperparameter_tuning.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet44-final_run.yaml b/configs/sample/cifar10/ce/resnet44-final_run.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet44-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/resnet44-hyperparameter_tuning.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet56-final_run.yaml b/configs/sample/cifar10/ce/resnet56-final_run.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/resnet56-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/resnet56-hyperparameter_tuning.yaml
@@ -84,7 +84,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/wide_resnet16_8-final_run.yaml b/configs/sample/cifar10/ce/wide_resnet16_8-final_run.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [60, 120, 160]
       gamma: 0.2
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/wide_resnet16_8-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/wide_resnet16_8-hyperparameter_tuning.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [60, 120, 160]
       gamma: 0.2
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/wide_resnet28_10-final_run.yaml b/configs/sample/cifar10/ce/wide_resnet28_10-final_run.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [60, 120, 160]
       gamma: 0.2
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/wide_resnet28_10-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/wide_resnet28_10-hyperparameter_tuning.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [60, 120, 160]
       gamma: 0.2
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/wide_resnet40_4-final_run.yaml b/configs/sample/cifar10/ce/wide_resnet40_4-final_run.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [60, 120, 160]
       gamma: 0.2
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/ce/wide_resnet40_4-hyperparameter_tuning.yaml b/configs/sample/cifar10/ce/wide_resnet40_4-hyperparameter_tuning.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [60, 120, 160]
       gamma: 0.2
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar10/kd/resnet20_from_densenet_bc_k12_depth100-final_run.yaml b/configs/sample/cifar10/kd/resnet20_from_densenet_bc_k12_depth100-final_run.yaml
@@ -97,7 +97,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'KDLoss'

diff --git a/configs/sample/cifar10/kd/resnet20_from_densenet_bc_k12_depth100-hyperparameter_tuning.yaml b/configs/sample/cifar10/kd/resnet20_from_densenet_bc_k12_depth100-hyperparameter_tuning.yaml
@@ -97,7 +97,7 @@ train:
       milestones: [91, 136]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'KDLoss'

diff --git a/configs/sample/cifar10/kd/wide_resnet40_1_from_wide_resnet40_4-final_run.yaml b/configs/sample/cifar10/kd/wide_resnet40_1_from_wide_resnet40_4-final_run.yaml
@@ -101,7 +101,7 @@ train:
       milestones: [60, 120, 160]
       gamma: 0.2
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'KDLoss'

diff --git a/configs/sample/cifar10/kd/wide_resnet40_1_from_wide_resnet40_4-hyperparameter_tuning.yaml b/configs/sample/cifar10/kd/wide_resnet40_1_from_wide_resnet40_4-hyperparameter_tuning.yaml
@@ -101,7 +101,7 @@ train:
       milestones: [60, 120, 160]
       gamma: 0.2
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'KDLoss'

diff --git a/configs/sample/cifar100/ce/densenet_bc_k12_depth100-final_run.yaml b/configs/sample/cifar100/ce/densenet_bc_k12_depth100-final_run.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar100/ce/densenet_bc_k12_depth100-hyperparameter_tuning.yaml b/configs/sample/cifar100/ce/densenet_bc_k12_depth100-hyperparameter_tuning.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar100/ce/densenet_bc_k24_depth250-final_run.yaml b/configs/sample/cifar100/ce/densenet_bc_k24_depth250-final_run.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'

diff --git a/configs/sample/cifar100/ce/densenet_bc_k24_depth250-hyperparameter_tuning.yaml b/configs/sample/cifar100/ce/densenet_bc_k24_depth250-hyperparameter_tuning.yaml
@@ -85,7 +85,7 @@ train:
       milestones: [150, 225]
       gamma: 0.1
   criterion:
-    type: 'GeneralizedCustomLoss'
+    type: 'WeightedSumLoss'
     org_term:
       criterion:
         type: 'CrossEntropyLoss'