chore: Merge latest upstream changes (#11)

* Fix PadToSize impl to follow Transform API after torchvision 0.21 (lyuwenyu#629) (duplicate #5)

* Add update config params for pytorch_v2 all tool scripts (lyuwenyu#633)

---------

Co-authored-by: Marcin Wątroba <[email protected]>

Author: guyleaf

rtdetrv2_pytorch/tools/export_onnx.py

@@ -7,15 +7,27 @@
 
 import torch
 import torch.nn as nn
-from rtdetrv2.core import YAMLConfig
+from rtdetrv2.core import YAMLConfig, yaml_utils
 from rtdetrv2.misc import import_modules
 
 
 def main(
     args,
 ):
     """main"""
-    cfg = YAMLConfig(args.config, resume=args.resume)
+    update_dict = yaml_utils.parse_cli(args.update) if args.update else {}
+    update_dict.update(
+        {
+            k: v
+            for k, v in args.__dict__.items()
+            if k
+            not in [
+                "update",
+            ]
+            and v is not None
+        }
+    )
+    cfg = YAMLConfig(args.config, **update_dict)
 
     if args.resume:
         checkpoint = torch.load(args.resume, map_location="cpu")
@@ -125,6 +137,7 @@ def forward(self, images, orig_target_sizes):
         default=[],
         help="preload modules before execution",
     )
+    parser.add_argument("--update", "-u", nargs="+", help="update yaml config")
 
     args = parser.parse_args()
 

rtdetrv2_pytorch/tools/run_profile.py

@@ -11,7 +11,7 @@
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
 from typing import Any, Dict, List, Optional
 
-from rtdetrv2.core import YAMLConfig
+from rtdetrv2.core import YAMLConfig, yaml_utils
 from rtdetrv2.misc import import_modules
 
 __all__ = ["profile_stats"]
@@ -98,11 +98,26 @@ def trace_handler(prof):
         default=[],
         help="preload modules before execution",
     )
+    parser.add_argument(
+        "-u", "--update", nargs="+", help="Update yaml config from command line."
+    )
     args = parser.parse_args()
 
     import_modules(args.preloads)
 
-    cfg = YAMLConfig(args.config, device=args.device)
+    update_dict = yaml_utils.parse_cli(args.update) if args.update else {}
+    update_dict.update(
+        {
+            k: v
+            for k, v in args.__dict__.items()
+            if k
+            not in [
+                "update",
+            ]
+            and v is not None
+        }
+    )
+    cfg = YAMLConfig(args.config, **update_dict)
     model = cfg.model.to(args.device)
 
     profile_stats(model, verbose=True)