Merge pull request #62 from tomas-gajarsky/chore/cleaning

Polishing
tomas-gajarsky · Dec 14, 2023 · c5714fa · c5714fa
2 parents 2b03df9 + 3f8832d
commit c5714fa
Show file tree

Hide file tree

Showing 22 changed files with 2,364 additions and 1,996 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Change Log
 
 
+## 0.4.1
+
+Released on December 14, 2023.
+
+### Changed
+* postprocessor for label confidence pairs to have no offset by default
+* Resize transform configs to enable antialiasing by default
+* notebook to version 0.4.0 or higher
+* notebook to include Action Unit and Valence Arousal predictors
+
+
 ## 0.4.0
 
 Released on December 13, 2023.

diff --git a/conf/analyzer/predictor/align/synergy_mobilenet_v2.yaml b/conf/analyzer/predictor/align/synergy_mobilenet_v2.yaml
@@ -16,6 +16,7 @@ preprocessor:
     transforms:
       - _target_: torchvision.transforms.Resize
         size: [120, 120] # List[int]
+        antialias: True # bool
   device: 
     _target_: torch.device
     type: ${analyzer.predictor.align.device.type}

diff --git a/conf/analyzer/predictor/au/open_graph_swin_base.yaml b/conf/analyzer/predictor/au/open_graph_swin_base.yaml
@@ -14,8 +14,9 @@ preprocessor:
   transform:
     _target_: torchvision.transforms.Compose
     transforms:
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size: [224, 224] # List[int]
+        antialias: True # bool
       - _target_: torchvision.transforms.Normalize
         mean: [0.485, 0.456, 0.406] # List[float]
         std: [0.229, 0.224, 0.225] # List[float]

diff --git a/conf/analyzer/predictor/deepfake/efficientnet_b7.yaml b/conf/analyzer/predictor/deepfake/efficientnet_b7.yaml
@@ -15,8 +15,9 @@ preprocessor:
   transform:
     _target_: torchvision.transforms.Compose
     transforms:
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size: [380, 380] # List[int]
+        antialias: True # bool
       - _target_: torchvision.transforms.Normalize
         mean: [0.485, 0.456, 0.406] # List[float]
         std: [0.229, 0.224, 0.225] # List[float]

diff --git a/conf/analyzer/predictor/embed/r50_vggface_1m.yaml b/conf/analyzer/predictor/embed/r50_vggface_1m.yaml
@@ -14,8 +14,9 @@ preprocessor:
   transform:
     _target_: torchvision.transforms.Compose
     transforms:
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size: [244, 244] # List[int]
+        antialias: True # bool
       - _target_: torchvision.transforms.Normalize
         mean: [0.485, 0.456, 0.406] # List[float]
         std: [0.228, 0.224, 0.225] # List[float]

diff --git a/conf/analyzer/predictor/fer/efficientnet_b0_7.yaml b/conf/analyzer/predictor/fer/efficientnet_b0_7.yaml
@@ -14,8 +14,9 @@ preprocessor:
   transform:
     _target_: torchvision.transforms.Compose
     transforms:
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size: [244, 244] # List[int]
+        antialias: True # bool
       - _target_: torchvision.transforms.Normalize
         mean: [0.485, 0.456, 0.406] # List[float]
         std: [0.229, 0.224, 0.225] # List[float]

diff --git a/conf/analyzer/predictor/fer/efficientnet_b2_8.yaml b/conf/analyzer/predictor/fer/efficientnet_b2_8.yaml
@@ -14,8 +14,9 @@ preprocessor:
   transform:
     _target_: torchvision.transforms.Compose
     transforms:
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size: [260, 260] # List[int]
+        antialias: True # bool
       - _target_: torchvision.transforms.Normalize
         mean: [0.485, 0.456, 0.406] # List[float]
         std: [0.229, 0.224, 0.225] # List[float]

diff --git a/conf/analyzer/predictor/va/elim_al_alexnet.yaml b/conf/analyzer/predictor/va/elim_al_alexnet.yaml
@@ -14,9 +14,9 @@ preprocessor:
   transform:
     _target_: torchvision.transforms.Compose
     transforms:
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size: [224, 224] # List[int]
-        antialias: True
+        antialias: True # bool
       - _target_: torchvision.transforms.Normalize
         mean: [0.485, 0.456, 0.406] # List[float]
         std: [0.229, 0.224, 0.225] # List[float]
@@ -33,4 +33,5 @@ postprocessor:
     _target_: torch.device
     type: ${analyzer.predictor.va.device.type}
   optimize_transform: ${analyzer.optimize_transforms}
-  labels: ["valence", "arousal"] # List
+  labels: ["valence", "arousal"] # List
+  offsets: [0, 0] # List
diff --git a/conf/analyzer/predictor/verify/adaface_ir101_webface12m.yaml b/conf/analyzer/predictor/verify/adaface_ir101_webface12m.yaml
@@ -14,8 +14,9 @@ preprocessor:
   transform:
     _target_: torchvision.transforms.Compose
     transforms:
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size: [112, 112] # List[int]
+        antialias: True # bool
       - _target_: torchvision.transforms.Normalize
         mean: [0.5, 0.5, 0.5] # List[float]
         std: [0.5, 0.5, 0.5] # List[float]

diff --git a/conf/analyzer/predictor/verify/r100_magface_unpg.yaml b/conf/analyzer/predictor/verify/r100_magface_unpg.yaml
@@ -14,8 +14,9 @@ preprocessor:
   transform:
     _target_: torchvision.transforms.Compose
     transforms:
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size: [112, 112] # List[int]
+        antialias: True # bool
       - _target_: torchvision.transforms.Normalize
         mean: [0.485, 0.456, 0.406] # List[float]
         std: [0.229, 0.224, 0.225] # List[float]

diff --git a/conf/analyzer/reader/default.yaml b/conf/analyzer/reader/default.yaml
@@ -9,3 +9,4 @@ transform:
     - _target_: facetorch.transforms.SquarePad
     - _target_: torchvision.transforms.Resize
       size: [1080] # List[int]
+      antialias: True # bool
diff --git a/conf/analyzer/unifier/img_244.yaml b/conf/analyzer/unifier/img_244.yaml
@@ -7,6 +7,7 @@ transform:
       std: [255., 255., 255.] # List[float]
     - _target_: torchvision.transforms.Resize
       size: [244, 244] # List[int]
+      antialias: True # bool
 device:
   _target_: torch.device
   type: ${analyzer.device} # str

diff --git a/conf/analyzer/unifier/img_260.yaml b/conf/analyzer/unifier/img_260.yaml
@@ -7,6 +7,7 @@ transform:
       std: [255., 255., 255.] # List[float]
     - _target_: torchvision.transforms.Resize
       size: [260, 260] # List[int]
+      antialias: True # bool
 device:
   _target_: torch.device
   type: ${analyzer.device} # str

diff --git a/conf/analyzer/unifier/img_380.yaml b/conf/analyzer/unifier/img_380.yaml
@@ -7,6 +7,7 @@ transform:
       std: [255., 255., 255.] # List[float]
     - _target_: torchvision.transforms.Resize
       size: [380, 380] # List[int]
+      antialias: True # bool
 device:
   _target_: torch.device
   type: ${analyzer.device} # str

diff --git a/conf/merged/gpu.merged.config.yaml b/conf/merged/gpu.merged.config.yaml
@@ -11,9 +11,10 @@ analyzer:
       _target_: torchvision.transforms.Compose
       transforms:
       - _target_: facetorch.transforms.SquarePad
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size:
         - 1080
+        antialias: True
   detector:
     _target_: facetorch.analyzer.detector.FaceDetector
     downloader:
@@ -88,10 +89,11 @@ analyzer:
         - 255.0
         - 255.0
         - 255.0
-      - _target_: torchvision.transforms.Resize
+      - _target_: torchvision.transforms.Resize        
         size:
         - 380
         - 380
+        antialias: True
     device:
       _target_: torch.device
       type: ${analyzer.device}
@@ -111,10 +113,11 @@ analyzer:
         transform:
           _target_: torchvision.transforms.Compose
           transforms:
-          - _target_: torchvision.transforms.Resize
+          - _target_: torchvision.transforms.Resize            
             size:
             - 244
             - 244
+            antialias: True
           - _target_: torchvision.transforms.Normalize
             mean:
             - 0.485
@@ -152,10 +155,11 @@ analyzer:
         transform:
           _target_: torchvision.transforms.Compose
           transforms:
-          - _target_: torchvision.transforms.Resize
+          - _target_: torchvision.transforms.Resize        
             size:
             - 112
             - 112
+            antialias: True
           - _target_: torchvision.transforms.Normalize
             mean:
             - 0.5
@@ -193,10 +197,11 @@ analyzer:
         transform:
           _target_: torchvision.transforms.Compose
           transforms:
-          - _target_: torchvision.transforms.Resize
+          - _target_: torchvision.transforms.Resize            
             size:
             - 260
             - 260
+            antialias: True
           - _target_: torchvision.transforms.Normalize
             mean:
             - 0.485
@@ -242,10 +247,11 @@ analyzer:
         transform:
           _target_: torchvision.transforms.Compose
           transforms:
-          - _target_: torchvision.transforms.Resize
+          - _target_: torchvision.transforms.Resize        
             size:
             - 224
             - 224
+            antialias: True
           - _target_: torchvision.transforms.Normalize
             mean:
             - 0.485
@@ -325,11 +331,11 @@ analyzer:
         transform:
           _target_: torchvision.transforms.Compose
           transforms:
-          - _target_: torchvision.transforms.Resize
+          - _target_: torchvision.transforms.Resize            
             size:
             - 224
             - 224
-            antialias: true
+            antialias: True
           - _target_: torchvision.transforms.Normalize
             mean:
             - 0.485
@@ -354,6 +360,9 @@ analyzer:
         labels:
         - valence
         - arousal
+        offsets:
+        - 0
+        - 0
     deepfake:
       _target_: facetorch.analyzer.predictor.FacePredictor
       downloader:
@@ -368,10 +377,11 @@ analyzer:
         transform:
           _target_: torchvision.transforms.Compose
           transforms:
-          - _target_: torchvision.transforms.Resize
+          - _target_: torchvision.transforms.Resize        
             size:
             - 380
             - 380
+            antialias: True
           - _target_: torchvision.transforms.Normalize
             mean:
             - 0.485
@@ -411,10 +421,11 @@ analyzer:
         transform:
           _target_: torchvision.transforms.Compose
           transforms:
-          - _target_: torchvision.transforms.Resize
+          - _target_: torchvision.transforms.Resize            
             size:
             - 120
             - 120
+            antialias: True
         device:
           _target_: torch.device
           type: ${analyzer.predictor.align.device.type}