Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5f63fc8
cpu-offload
jren73 Aug 4, 2020
e01238b
update
jren73 Aug 4, 2020
73b956b
updte
jren73 Aug 4, 2020
98deb70
deleted: deepspeed/pt/deepspeed_zero_optimizer_cpuoffload.py
jren73 Aug 6, 2020
e3b2a42
modified: deepspeed/pt/deepspeed_zero_optimizer.py
jren73 Aug 7, 2020
f832a2e
update
jren73 Aug 10, 2020
004884b
modified: deepspeed/pt/deepspeed_cpu_adam.py
jren73 Aug 10, 2020
0effd77
deleted: install_output.txt
jren73 Aug 10, 2020
af3b834
modified: deepspeed/pt/fp16_unfused_optimizer.py
jren73 Aug 10, 2020
e2d936d
Merge pull request #2 from jren73/ZeRO-2-cpu_offload
jren73 Aug 10, 2020
ef5c785
modified: deepspeed/pt/deepspeed_cpu_adam.py
jren73 Aug 11, 2020
7f0a856
Merge pull request #3 from jren73/ZeRO-2-cpu_offload
jren73 Aug 11, 2020
6e45e8b
modified: deepspeed/pt/deepspeed_zero_optimizer.py
jren73 Aug 11, 2020
e930604
Merge pull request #4 from jren73/ZeRO-2-cpu_offload
jren73 Aug 11, 2020
d2cc800
Merge branch 'master' into master
jeffra Aug 11, 2020
f8812b9
modified: deepspeed/pt/deepspeed_cpu_adam.py
jren73 Aug 11, 2020
d1a435c
Merge pull request #5 from jren73/ZeRO-2-cpu_offload
jren73 Aug 11, 2020
6415738
deleted: deepspeed_cpu_adam.py
jren73 Aug 17, 2020
7eb6041
Merge pull request #6 from jren73/ZeRO-2-cpu_offload
jren73 Aug 17, 2020
fbd79c6
modified: deepspeed/pt/deepspeed_light.py
jren73 Aug 17, 2020
f1a180f
Merge pull request #7 from jren73/ZeRO-2-cpu_offload
jren73 Aug 18, 2020
5181c60
modified: deepspeed/pt/deepspeed_light.py
jren73 Aug 18, 2020
a2b7433
Merge pull request #8 from jren73/ZeRO-2-cpu_offload
jren73 Aug 18, 2020
41f18d1
modified: deepspeed/pt/deepspeed_config.py
jren73 Aug 24, 2020
3835b22
Merge pull request #9 from jren73/ZeRO-2-cpu_offload
jren73 Aug 24, 2020
ffad985
modified: deepspeed/pt/deepspeed_checkpointing.py
jren73 Aug 28, 2020
1e46c91
Merge pull request #12 from jren73/ZeRO-2-cpu_offload
jren73 Aug 28, 2020
646f709
update DSE to ZeRO-Offload commit
jren73 Aug 28, 2020
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
200 changes: 200 additions & 0 deletions deepspeed/pt/deepspeed_cpu_adam.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
import math
import torch


class CPUAdam(torch.optim.Optimizer):
Comment thread
tjruwase marked this conversation as resolved.
Outdated
r"""Implements Adam algorithm.

It has been proposed in `Adam: A Method for Stochastic Optimization`_.

Arguments:
params (iterable): iterable of parameters to optimize or dicts defining
parameter groups
lr (float, optional): learning rate (default: 1e-3)
betas (Tuple[float, float], optional): coefficients used for computing
running averages of gradient and its square (default: (0.9, 0.999))
eps (float, optional): term added to the denominator to improve
numerical stability (default: 1e-8)
weight_decay (float, optional): weight decay (L2 penalty) (default: 0)
amsgrad (boolean, optional): whether to use the AMSGrad variant of this
algorithm from the paper `On the Convergence of Adam and Beyond`_
(default: False)

.. _Adam\: A Method for Stochastic Optimization:
https://arxiv.org/abs/1412.6980
.. _On the Convergence of Adam and Beyond:
https://openreview.net/forum?id=ryQu7f-RZ
"""
def __init__(self,
params,
lr=1e-3,
betas=(0.9,
0.999),
eps=1e-8,
weight_decay=0,
amsgrad=False):
if not 0.0 <= lr:
raise ValueError("Invalid learning rate: {}".format(lr))
if not 0.0 <= eps:
raise ValueError("Invalid epsilon value: {}".format(eps))
if not 0.0 <= betas[0] < 1.0:
raise ValueError("Invalid beta parameter at index 0: {}".format(betas[0]))
if not 0.0 <= betas[1] < 1.0:
raise ValueError("Invalid beta parameter at index 1: {}".format(betas[1]))
defaults = dict(lr=lr,
betas=betas,
eps=eps,
weight_decay=weight_decay,
amsgrad=amsgrad)
super(CPUAdam, self).__init__(params, defaults)

def __setstate__(self, state):
super(CPUAdam, self).__setstate__(state)
for group in self.param_groups:
group.setdefault('amsgrad', False)

def step_with_cpuoffload(self,
closure=None,
fp32_params=None,
fp32_params_grad=None,
exp_avg=None,
exp_avg_sq=None):
"""Performs a single optimization step.

Arguments:
closure (callable, optional): A closure that reevaluates the model
and returns the loss.
fp32_params: fp32 params on CPU
fp32_params_grad: the normolized gradients in fp32 groups
exp_avg: optimizer state
exp_avg_sq: optimizer state
"""
loss = None
if closure is not None:
loss = closure()

if fp32_params is None:
raise RuntimeError('params is None')

index = 0

for group in self.param_groups:
group_size = sum([t.numel() for t in group['params']])
p = torch.zeros(group_size, device=torch.device('cpu'), requires_grad=True)
p = fp32_params[index:index + group_size].detach()
p_grad = torch.zeros(group_size, device=torch.device('cpu'))
p_grad = fp32_params_grad[index:index + group_size].detach()
p.grad = p_grad
if p.grad is None:
continue
grad = p.grad.data
if grad.is_sparse:
raise RuntimeError(
'Adam does not support sparse gradients, please consider SparseAdam instead'
)
amsgrad = group['amsgrad']

state = self.state[p]

# State initialization
if len(state) == 0:
state['step'] = 0

beta1, beta2 = group['betas']

state['step'] += 1

if group['weight_decay'] != 0:
grad.add_(group['weight_decay'], p.data)

# Decay the first and second moment running average coefficient
exp_avg[index:index + group_size].mul_(beta1).add_(1 - beta1, grad)
exp_avg_sq[index:index + group_size].mul_(beta2).addcmul_(
1 - beta2,
grad,
grad)

denom = exp_avg_sq[index:index + group_size].sqrt().add_(group['eps'])

bias_correction1 = 1 - beta1**state['step']
bias_correction2 = 1 - beta2**state['step']
step_size = group['lr'] * math.sqrt(bias_correction2) / bias_correction1

p.data.addcdiv_(-step_size, exp_avg[index:index + group_size], denom)

index += group_size

return loss

def step(self, closure=None):
"""Performs a single optimization step.

Arguments:
closure (callable, optional): A closure that reevaluates the model
and returns the loss.
"""
loss = None
if closure is not None:
with torch.enable_grad():
loss = closure()

for group in self.param_groups:
for p in group['params']:
if p.grad is None:
continue
grad = p.grad
if grad.is_sparse:
raise RuntimeError(
'Adam does not support sparse gradients, please consider SparseAdam instead'
)
amsgrad = group['amsgrad']

state = self.state[p]

# State initialization
if len(state) == 0:
state['step'] = 0
# Exponential moving average of gradient values
state['exp_avg'] = torch.zeros_like(
p,
memory_format=torch.preserve_format)
# Exponential moving average of squared gradient values
state['exp_avg_sq'] = torch.zeros_like(
p,
memory_format=torch.preserve_format)
if amsgrad:
# Maintains max of all exp. moving avg. of sq. grad. values
state['max_exp_avg_sq'] = torch.zeros_like(
p,
memory_format=torch.preserve_format)

exp_avg, exp_avg_sq = state['exp_avg'], state['exp_avg_sq']
if amsgrad:
max_exp_avg_sq = state['max_exp_avg_sq']
beta1, beta2 = group['betas']

state['step'] += 1
bias_correction1 = 1 - beta1**state['step']
bias_correction2 = 1 - beta2**state['step']

if group['weight_decay'] != 0:
grad = grad.add(p, alpha=group['weight_decay'])

# Decay the first and second moment running average coefficient
exp_avg.mul_(beta1).add_(grad, alpha=1 - beta1)
exp_avg_sq.mul_(beta2).addcmul_(grad, grad, value=1 - beta2)
if amsgrad:
# Maintains the maximum of all 2nd moment running avg. till now
torch.max(max_exp_avg_sq, exp_avg_sq, out=max_exp_avg_sq)
# Use the max. for normalizing running avg. of gradient
denom = (max_exp_avg_sq.sqrt() / math.sqrt(bias_correction2)).add_(
group['eps'])
else:
denom = (exp_avg_sq.sqrt() / math.sqrt(bias_correction2)).add_(
group['eps'])

step_size = group['lr'] / bias_correction1

p.addcdiv_(exp_avg, denom, value=-step_size)

return loss
26 changes: 19 additions & 7 deletions deepspeed/pt/deepspeed_light.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from deepspeed.pt.fp16_optimizer import FP16_Optimizer
from deepspeed.pt.fp16_unfused_optimizer import FP16_UnfusedOptimizer
from deepspeed.pt.deepspeed_fused_lamb import FusedLamb
from deepspeed.pt.deepspeed_cpu_adam import CPUAdam
from deepspeed.pt.deepspeed_config import DeepSpeedConfig, \
ADAM_OPTIMIZER, LAMB_OPTIMIZER, DEEPSPEED_OPTIMIZERS

Expand Down Expand Up @@ -107,7 +108,6 @@ def __init__(self,
collate_fn=None,
config_params=None):
super(DeepSpeedLight, self).__init__()

self.client_optimizer = optimizer
self.client_model_parameters = model_parameters
self.client_lr_scheduler = lr_scheduler
Expand Down Expand Up @@ -293,6 +293,9 @@ def zero_reduce_scatter(self):
def zero_overlap_comm(self):
return self._config.zero_config.overlap_comm

def zero_cpu_offload(self):
return self._config.zero_config.cpu_offload

def zero_optimization_stage(self):
return self._config.zero_optimization_stage

Expand Down Expand Up @@ -492,7 +495,13 @@ def _configure_distributed_model(self, model):

# Configure optimizer
def _configure_optimizer(self, client_optimizer, model_parameters):
if client_optimizer is not None:
#jie:
if self.zero_cpu_offload():
optimizer_parameters = self.optimizer_params()
basic_optimizer = CPUAdam(client_optimizer.param_groups,
**optimizer_parameters)
logger.info('Using CPU Optimizer as basic optimizer')
elif client_optimizer is not None:
basic_optimizer = client_optimizer
logger.info('Using client Optimizer as basic optimizer')
else:
Expand Down Expand Up @@ -523,8 +532,8 @@ def _configure_optimizer(self, client_optimizer, model_parameters):
self.optimizer = self._configure_fp16_optimizer(basic_optimizer)
else:
self.optimizer = basic_optimizer

# logger.info('DeepSpeed Final Optimizer = {}'.format(self.optimizer.state_dict()))
logger.info('DeepSpeed Final Optimizer = {}'.format(self.optimizer))
logger.info('DeepSpeed Final Optimizer = {}'.format(self.optimizer.state_dict()))

def _configure_basic_optimizer(self, model_parameters):
optimizer_parameters = self.optimizer_params()
Expand All @@ -533,8 +542,11 @@ def _configure_basic_optimizer(self, model_parameters):
"'max_grad_norm' is not supported as an optimizer parameter, please switch to using the deepspeed parameter 'gradient_clipping' see: https://www.deepspeed.ai/docs/config-json/#gradient-clipping for more details"
)
if self.optimizer_name() == ADAM_OPTIMIZER:
from apex.optimizers.fused_adam import FusedAdam
optimizer = FusedAdam(model_parameters, **optimizer_parameters)
if self.zero_cpu_offload():
Comment thread
tjruwase marked this conversation as resolved.
Outdated
optimizer = CPUAdam(model_parameters, **optimizer_parameters)
else:
from apex.optimizers.fused_adam import FusedAdam
optimizer = FusedAdam(model_parameters, **optimizer_parameters)
elif self.optimizer_name() == LAMB_OPTIMIZER:
optimizer = FusedLamb(model_parameters, **optimizer_parameters)
else:
Expand Down Expand Up @@ -613,6 +625,7 @@ def _configure_zero_optimizer(self, optimizer):
dp_process_group=self.data_parallel_group,
reduce_scatter=self.zero_reduce_scatter(),
overlap_comm=self.zero_overlap_comm(),
cpu_offload=self.zero_cpu_offload(),
mpu=self.mpu,
postscale_gradients=self.postscale_gradients(),
gradient_predivide_factor=self.gradient_predivide_factor())
Expand Down Expand Up @@ -843,7 +856,6 @@ def step(self):
master_params = amp.master_params(self.optimizer)
torch.nn.utils.clip_grad_norm_(parameters=master_params,
max_norm=self.gradient_clipping())

self.optimizer.step()

#zero grad in basic optimizer could be unreliable and may not exhibit
Expand Down
22 changes: 15 additions & 7 deletions deepspeed/pt/deepspeed_zero_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"overlap_comm": [true|false],
"reduce_bucket_size": 500000000
"load_from_fp32_weights": [true|false]
"cpu_offload": [true|false]
}
}
'''
Expand Down Expand Up @@ -63,21 +64,22 @@
ZERO_OPTIMIZATION_LOAD_FROM_FP32_WEIGHTS = 'load_from_fp32_weights'
ZERO_OPTIMIZATION_LOAD_FROM_FP32_WEIGHTS_DEFAULT = True

ZERO_OPTIMIZATION_CPU_OFFLOAD = 'cpu_offload'
ZERO_OPTIMIZATION_CPU_OFFLOAD_DEFAULT = False

ZERO_OPTIMIZATION_DEFAULT = {
ZERO_OPTIMIZATION_STAGE:
ZERO_OPTIMIZATION_STAGE_DEFAULT,
ZERO_OPTIMIZATION_STAGE: ZERO_OPTIMIZATION_STAGE_DEFAULT,
ZERO_OPTIMIZATION_CONTIGUOUS_GRADIENTS:
ZERO_OPTIMIZATION_CONTIGUOUS_GRADIENTS_DEFAULT,
ZERO_OPTIMIZATION_REDUCE_SCATTER:
ZERO_OPTIMIZATION_REDUCE_SCATTER_DEFAULT,
ZERO_OPTIMIZATION_REDUCE_BUCKET_SIZE:
ZERO_OPTIMIZATION_REDUCE_BUCKET_SIZE_DEFAULT,
ZERO_OPTIMIZATION_REDUCE_SCATTER: ZERO_OPTIMIZATION_REDUCE_SCATTER_DEFAULT,
ZERO_OPTIMIZATION_REDUCE_BUCKET_SIZE: ZERO_OPTIMIZATION_REDUCE_BUCKET_SIZE_DEFAULT,
ZERO_OPTIMIZATION_ALLGATHER_PARTITIONS:
ZERO_OPTIMIZATION_ALLGATHER_PARTITIONS_DEFAULT,
ZERO_OPTIMIZATION_ALLGATHER_BUCKET_SIZE:
ZERO_OPTIMIZATION_ALLGATHER_BUCKET_SIZE_DEFAULT,
ZERO_OPTIMIZATION_LOAD_FROM_FP32_WEIGHTS:
ZERO_OPTIMIZATION_LOAD_FROM_FP32_WEIGHTS_DEFAULT
ZERO_OPTIMIZATION_LOAD_FROM_FP32_WEIGHTS_DEFAULT,
ZERO_OPTIMIZATION_CPU_OFFLOAD: ZERO_OPTIMIZATION_CPU_OFFLOAD_DEFAULT
}


Expand All @@ -93,6 +95,7 @@ def __init__(self, param_dict):
self.allgather_bucket_size = None
self.overlap_comm = None
self.load_from_fp32_weights = None
self.cpu_offload = None

if ZERO_OPTIMIZATION in param_dict.keys():
zero_config_dict = param_dict[ZERO_OPTIMIZATION]
Expand Down Expand Up @@ -157,7 +160,12 @@ def _initialize(self, zero_config_dict):
zero_config_dict,
ZERO_OPTIMIZATION_ALLGATHER_BUCKET_SIZE,
ZERO_OPTIMIZATION_ALLGATHER_BUCKET_SIZE_DEFAULT)

self.load_from_fp32_weights = get_scalar_param(
zero_config_dict,
ZERO_OPTIMIZATION_LOAD_FROM_FP32_WEIGHTS,
ZERO_OPTIMIZATION_LOAD_FROM_FP32_WEIGHTS_DEFAULT)

self.cpu_offload = get_scalar_param(zero_config_dict,
ZERO_OPTIMIZATION_CPU_OFFLOAD,
ZERO_OPTIMIZATION_CPU_OFFLOAD_DEFAULT)
Loading