Switching to Torch 2.0 by default. (#1922)

* Update requirements for torch 2.0

* Update docs

* Fix missing _LRScheduler import

* Fix pylint issues

* Update docs, drop 1.13

* Fix pip postfix version

* fix docs

* Allow python 1.13 (for now)

* Minor fix for torch.compile

* Switch to torch.compile

* ruff

* Fix test

---------

Co-authored-by: Matt Tancik <mattt4001@gmail.com>
Co-authored-by: Matthew Tancik <tancik@berkeley.edu>
This commit is contained in:
authored and GitHub committed 2023-05-17 16:03:17 -07:00
1 parent be291970db
commit e898f562e6
10 files changed
+83 -75

No files matched your search

+12 -4
View File
@@ -24,6 +24,14 @@ from torch.optim import Optimizer, lr_scheduler
from nerfstudio.configs.base_config import InstantiateConfig
try:
from torch.optim.lr_scheduler import ( # pylint: disable=ungrouped-imports
LRScheduler,
)
except ImportError:
# Backward compatibility for PyTorch 1.x
from torch.optim.lr_scheduler import _LRScheduler as LRScheduler
@dataclass
class SchedulerConfig(InstantiateConfig):
@@ -43,7 +51,7 @@ class Scheduler:
self.config = config
@abstractmethod
def get_scheduler(self, optimizer: Optimizer, lr_init: float) -> lr_scheduler._LRScheduler:
def get_scheduler(self, optimizer: Optimizer, lr_init: float) -> LRScheduler:
"""Abstract method that returns a scheduler object.
Args:
@@ -73,7 +81,7 @@ class MultiStepScheduler(Scheduler):
config: MultiStepSchedulerConfig
def get_scheduler(self, optimizer: Optimizer, lr_init: float) -> lr_scheduler._LRScheduler:
def get_scheduler(self, optimizer: Optimizer, lr_init: float) -> LRScheduler:
scheduler = lr_scheduler.MultiStepLR(
optimizer=optimizer,
milestones=self.config.milestones,
@@ -107,7 +115,7 @@ class ExponentialDecayScheduler(Scheduler):
config: ExponentialDecaySchedulerConfig
def get_scheduler(self, optimizer: Optimizer, lr_init: float) -> lr_scheduler._LRScheduler:
def get_scheduler(self, optimizer: Optimizer, lr_init: float) -> LRScheduler:
if self.config.lr_final is None:
lr_final = lr_init
else:
@@ -154,7 +162,7 @@ class CosineDecayScheduler(Scheduler):
config: CosineDecaySchedulerConfig
def get_scheduler(self, optimizer: Optimizer, lr_init: float) -> lr_scheduler._LRScheduler:
def get_scheduler(self, optimizer: Optimizer, lr_init: float) -> LRScheduler:
def func(step):
if step < self.config.warm_up_end:
learning_factor = step / self.config.warm_up_end