fix Adafactor optim on torch2.5 and fix compatibility

mmengine/optim/optimizer/builder.py

@@ -25,7 +25,11 @@ def register_torch_optimizers() -> List[str]:
         _optim = getattr(torch.optim, module_name)
         if inspect.isclass(_optim) and issubclass(_optim,
                                                   torch.optim.Optimizer):
-            OPTIMIZERS.register_module(module=_optim)
+            if module_name == 'Adafactor':
+                OPTIMIZERS.register_module(
+                    name='torch_Adafactor', module=_optim)
+            else:
+                OPTIMIZERS.register_module(module=_optim)
             torch_optimizers.append(module_name)
     return torch_optimizers
 

mmengine/registry/build_functions.py

@@ -3,8 +3,10 @@
 import logging
 from typing import TYPE_CHECKING, Any, Optional, Union
 
+import torch
+
 from mmengine.config import Config, ConfigDict
-from mmengine.utils import ManagerMixin
+from mmengine.utils import ManagerMixin, digit_version
 from .registry import Registry
 
 if TYPE_CHECKING:
@@ -232,6 +234,18 @@ def build_model_from_cfg(
         return build_from_cfg(cfg, registry, default_args)
 
 
+def build_optimizer_from_cfg(
+        cfg: Union[dict, ConfigDict, Config],
+        registry: Registry,
+        default_args: Optional[Union[dict, ConfigDict, Config]] = None) -> Any:
+    if 'Adafactor' == cfg['type'] and digit_version(
+            torch.__version__) >= digit_version('2.5.0'):
+        from ..logging import print_log
+        print_log(
+            'the torch version of Adafactor is registered as torch_Adafactor')
+    return build_from_cfg(cfg, registry, default_args)
+
+
 def build_scheduler_from_cfg(
     cfg: Union[dict, ConfigDict, Config],
     registry: Registry,

mmengine/registry/root.py

@@ -6,8 +6,8 @@
 https://mmengine.readthedocs.io/en/latest/advanced_tutorials/registry.html.
 """
 
-from .build_functions import (build_model_from_cfg, build_runner_from_cfg,
-                              build_scheduler_from_cfg)
+from .build_functions import (build_model_from_cfg, build_optimizer_from_cfg,
+                              build_runner_from_cfg, build_scheduler_from_cfg)
 from .registry import Registry
 
 # manage all kinds of runners like `EpochBasedRunner` and `IterBasedRunner`
@@ -35,7 +35,7 @@
 WEIGHT_INITIALIZERS = Registry('weight initializer')
 
 # mangage all kinds of optimizers like `SGD` and `Adam`
-OPTIMIZERS = Registry('optimizer')
+OPTIMIZERS = Registry('optimizer', build_func=build_optimizer_from_cfg)
 # manage optimizer wrapper
 OPTIM_WRAPPERS = Registry('optim_wrapper')
 # manage constructors that customize the optimization hyperparameters.

mmengine/testing/_internal/distributed.py

@@ -92,10 +92,25 @@ def wrapper(self):
     # Constructor patches current instance test method to
     # assume the role of the main process and join its subprocesses,
     # or run the underlying test function.
-    def __init__(self, method_name: str = 'runTest') -> None:
+    def __init__(self,
+                 method_name: str = 'runTest',
+                 methodName: str = 'runTest') -> None:
+        # methodName is the correct naming in unittest
+        # and testslide uses keyword arguments.
+        # So we need to use both to 1) not break BC and, 2) support testslide.
+        if methodName != 'runTest':
+            method_name = methodName
         super().__init__(method_name)
-        fn = getattr(self, method_name)
-        setattr(self, method_name, self.join_or_run(fn))
+        try:
+            fn = getattr(self, method_name)
+            setattr(self, method_name, self.join_or_run(fn))
+        except AttributeError as e:
+            if methodName != 'runTest':
+                # we allow instantiation with no explicit method name
+                # but not an *incorrect* or missing method name
+                raise ValueError(
+                    f'no such test method in {self.__class__}: {methodName}'
+                ) from e
 
     def setUp(self) -> None:
         super().setUp()