Unverified Commit 079bf3cb authored by Hongxin Liu's avatar Hongxin Liu Committed by GitHub
Browse files

[misc] update pre-commit and run all files (#4752)

* [misc] update pre-commit

* [misc] run pre-commit

* [misc] remove useless configuration files

* [misc] ignore cuda for clang-format
parent 3c6b831c
This diff is collapsed.
...@@ -2,7 +2,4 @@ from .base import Strategy ...@@ -2,7 +2,4 @@ from .base import Strategy
from .colossalai import GeminiStrategy, LowLevelZeroStrategy from .colossalai import GeminiStrategy, LowLevelZeroStrategy
from .ddp import DDPStrategy from .ddp import DDPStrategy
__all__ = [ __all__ = ["Strategy", "DDPStrategy", "LowLevelZeroStrategy", "GeminiStrategy"]
'Strategy', 'DDPStrategy',
'LowLevelZeroStrategy', 'GeminiStrategy'
]
...@@ -19,7 +19,7 @@ _BoostArgSpec = Union[nn.Module, Tuple[nn.Module, Optimizer], Dict] ...@@ -19,7 +19,7 @@ _BoostArgSpec = Union[nn.Module, Tuple[nn.Module, Optimizer], Dict]
class Strategy(ABC): class Strategy(ABC):
""" """
Base class for training strategies. Base class for training strategies.
""" """
def __init__(self, plugin_initializer: Callable[..., Optional[Plugin]] = lambda: None) -> None: def __init__(self, plugin_initializer: Callable[..., Optional[Plugin]] = lambda: None) -> None:
...@@ -83,16 +83,18 @@ class Strategy(ABC): ...@@ -83,16 +83,18 @@ class Strategy(ABC):
rets.append((model, optimizer)) rets.append((model, optimizer))
elif isinstance(arg, Dict): elif isinstance(arg, Dict):
model, optimizer, criterion, dataloader, lr_scheduler = self.booster.boost(**arg) model, optimizer, criterion, dataloader, lr_scheduler = self.booster.boost(**arg)
boost_result = dict(model=model, boost_result = dict(
optimizer=optimizer, model=model,
criterion=criterion, optimizer=optimizer,
dataloader=dataloader, criterion=criterion,
lr_scheduler=lr_scheduler) dataloader=dataloader,
lr_scheduler=lr_scheduler,
)
# remove None values # remove None values
boost_result = {key: value for key, value in boost_result.items() if value is not None} boost_result = {key: value for key, value in boost_result.items() if value is not None}
rets.append(boost_result) rets.append(boost_result)
else: else:
raise RuntimeError(f'Type {type(arg)} is not supported') raise RuntimeError(f"Type {type(arg)} is not supported")
return rets[0] if len(rets) == 1 else rets return rets[0] if len(rets) == 1 else rets
...@@ -125,11 +127,9 @@ class Strategy(ABC): ...@@ -125,11 +127,9 @@ class Strategy(ABC):
return DistributedSampler(dataset, 1, 0) return DistributedSampler(dataset, 1, 0)
@abstractmethod @abstractmethod
def save_pretrained(self, def save_pretrained(
model: nn.Module, self, model: nn.Module, path: str, only_rank0: bool = True, tokenizer: Optional[PreTrainedTokenizerBase] = None
path: str, ) -> None:
only_rank0: bool = True,
tokenizer: Optional[PreTrainedTokenizerBase] = None) -> None:
pass pass
@abstractmethod @abstractmethod
......
...@@ -42,7 +42,6 @@ def is_rank_0() -> bool: ...@@ -42,7 +42,6 @@ def is_rank_0() -> bool:
def to_device(x: Any, device: torch.device) -> Any: def to_device(x: Any, device: torch.device) -> Any:
def _to(t: Any): def _to(t: Any):
if isinstance(t, torch.Tensor): if isinstance(t, torch.Tensor):
return t.to(device) return t.to(device)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -7,6 +7,9 @@ from .utils import ( ...@@ -7,6 +7,9 @@ from .utils import (
) )
__all__ = [ __all__ = [
'get_evaluator', 'convert_data_to_unieval_format', 'calculate_average_score', 'save_unieval_results', "get_evaluator",
'analyze_unieval_results' "convert_data_to_unieval_format",
"calculate_average_score",
"save_unieval_results",
"analyze_unieval_results",
] ]
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment