Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions optimizer/emofact.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,27 @@

class EmoFact(Optimizer):
# クラス定義&初期化
def __init__(self, params, lr=1e-3, betas=(0.9, 0.999), eps=1e-8, weight_decay=0.01,
use_shadow: bool = False, use_trust: bool = True, max_norm=1.0,
min_lr=1e-6, writer=None):
defaults = dict(lr=lr, betas=betas, eps=eps, weight_decay=weight_decay)
def __init__(
self,
params,
lr=1e-3,
betas=(0.9, 0.999),
eps=1e-8,
weight_decay=0.01,
use_shadow: bool = False,
use_trust: bool = True,
max_norm=1.0,
min_lr=1e-6,
writer=None,
):
defaults = dict(
lr=lr,
betas=betas,
eps=eps,
weight_decay=weight_decay,
)
super().__init__(params, defaults)

self._init_lr = lr
self.should_stop = False # 停止フラグの初期化
self.use_shadow = use_shadow # 🔸shadowの使用フラグを保存
Expand Down
25 changes: 21 additions & 4 deletions optimizer/emolynx.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,29 @@ def exists(val):

class EmoLynx(Optimizer):
# クラス定義&初期化 lynx用ベータ・互換性の追加(lynx用beta1・beta2)
def __init__(self, params: Union[list, torch.nn.Module], lr=1e-3, betas=(0.9, 0.99),
eps=1e-8, weight_decay=0.01, decoupled_weight_decay: bool = False, use_shadow: bool = False, use_trust: bool = True, max_norm=1.0,
min_lr=1e-6, writer=None):
defaults = dict(lr=lr, betas=betas, eps=eps, weight_decay=weight_decay)
def __init__(
self,
params: Union[list, torch.nn.Module],
lr=1e-3,
betas=(0.9, 0.99),
eps=1e-8,
weight_decay=0.01,
decoupled_weight_decay: bool = False,
use_shadow: bool = False,
use_trust: bool = True,
max_norm=1.0,
min_lr=1e-6,
writer=None,
):
defaults = dict(
lr=lr,
betas=betas,
eps=eps,
weight_decay=weight_decay,
)
super().__init__(params, defaults)
# lynxに応じてウェイト減衰のため保存

self._init_lr = lr
self.should_stop = False # 停止フラグの初期化
self.decoupled_wd = decoupled_weight_decay
Expand Down
24 changes: 20 additions & 4 deletions optimizer/emonavi.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,27 @@

class EmoNavi(Optimizer):
# クラス定義&初期化
def __init__(self, params, lr=1e-3, betas=(0.9, 0.999), eps=1e-8, weight_decay=0.01,
use_shadow: bool = False, use_trust: bool = True, max_norm=1.0,
min_lr=1e-6, writer=None):
defaults = dict(lr=lr, betas=betas, eps=eps, weight_decay=weight_decay)
def __init__(
self,
params,
lr=1e-3,
betas=(0.9, 0.999),
ps=1e-8,
weight_decay=0.01,
use_shadow: bool = False,
use_trust: bool = True,
max_norm=1.0,
min_lr=1e-6,
writer=None,
):
defaults = dict(
lr=lr,
betas=betas,
eps=eps,
weight_decay=weight_decay,
)
super().__init__(params, defaults)

self._init_lr = lr
self.should_stop = False # 停止フラグの初期化
self.use_shadow = use_shadow # 🔸shadowの使用フラグを保存
Expand Down