chore: import upstream snapshot with attribution
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
@@ -0,0 +1,79 @@
|
||||
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import warnings
|
||||
|
||||
import paddle
|
||||
from paddle.incubate.distributed.fleet.parameter_server.ir.trainer_pass import (
|
||||
create_heter_program,
|
||||
create_trainer_program,
|
||||
find_block_joints,
|
||||
find_heter_ops,
|
||||
union_forward_gradient_op,
|
||||
)
|
||||
|
||||
|
||||
def split_heter_worker_ops_pass(program, config, stage_id, device):
|
||||
"""
|
||||
split heter worker program from origin-program
|
||||
1. find heter op (located on different device)
|
||||
2. find input&output of every heter-block
|
||||
3. create heter worker program, add listen&serv op
|
||||
"""
|
||||
default_device = "cpu"
|
||||
program, heter_ops, _, program_block_ops = find_heter_ops(
|
||||
program, default_device
|
||||
)
|
||||
if len(heter_ops) == 0:
|
||||
warnings.warn(
|
||||
"Currently running in Heter Parameter Server mode, but no OP running on heterogeneous devices, Please check your code."
|
||||
)
|
||||
return program
|
||||
|
||||
program_block_ops = union_forward_gradient_op(program_block_ops)
|
||||
block_vars_detail = find_block_joints(program, program_block_ops, heter_ops)
|
||||
heter_program = paddle.static.Program()
|
||||
create_heter_program(
|
||||
program,
|
||||
config,
|
||||
heter_program,
|
||||
program_block_ops,
|
||||
heter_ops,
|
||||
block_vars_detail,
|
||||
device,
|
||||
stage_id,
|
||||
)
|
||||
return heter_program
|
||||
|
||||
|
||||
def split_trainer_ops_pass(program, config, default_device="cpu"):
|
||||
"""
|
||||
split cpu-trainer program from origin-program
|
||||
1. find heter op (located on different device)
|
||||
2. find input&output of every heter-block
|
||||
3. create cpu-trainer program, add send&recv op
|
||||
"""
|
||||
# Todo: support user define default_device (MrChengmo)
|
||||
default_device_ = default_device
|
||||
program, heter_ops, default_ops, program_block_ops = find_heter_ops(
|
||||
program, default_device_
|
||||
)
|
||||
program_block_ops = union_forward_gradient_op(program_block_ops)
|
||||
|
||||
block_vars_detail = find_block_joints(program, program_block_ops, heter_ops)
|
||||
trainer_program = program.clone()
|
||||
create_trainer_program(
|
||||
trainer_program, program, config, program_block_ops, block_vars_detail
|
||||
)
|
||||
return trainer_program
|
||||
@@ -0,0 +1,127 @@
|
||||
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
class PSDispatcher:
|
||||
"""
|
||||
PSDispatcher is the base class for dispatching vars
|
||||
into different pserver instance.
|
||||
You need to implement the `dispatch` interface.
|
||||
"""
|
||||
|
||||
def __init__(self, pserver_endpoints):
|
||||
self._eps = pserver_endpoints
|
||||
self._step = 0
|
||||
|
||||
@property
|
||||
def eps(self):
|
||||
return self._eps
|
||||
|
||||
def reset(self):
|
||||
"""
|
||||
reset the step counter, set it zero.
|
||||
"""
|
||||
self._step = 0
|
||||
|
||||
def dispatch(self, varlist):
|
||||
"""
|
||||
Args:
|
||||
varlist(list): a list of Variables
|
||||
Returns:
|
||||
a map of pserver endpoint -> varname
|
||||
"""
|
||||
raise NotImplementedError("Interface has not been implemented.")
|
||||
|
||||
|
||||
class HashName(PSDispatcher):
|
||||
"""
|
||||
Hash variable names to several endpoints using python
|
||||
"hash()" function.
|
||||
|
||||
Args:
|
||||
pserver_endpoints (list): list of endpoint(ip:port).
|
||||
|
||||
Examples:
|
||||
.. code-block:: pycon
|
||||
|
||||
>>> from paddle.incubate.distributed.fleet.parameter_server.ir.ps_dispatcher import RoundRobin
|
||||
|
||||
>>> pserver_endpoints = ["127.0.0.1:6007", "127.0.0.1:6008"]
|
||||
>>> vars = ["var1", "var2", "var3", "var4", "var5"]
|
||||
|
||||
>>> rr = HashName(pserver_endpoints)
|
||||
>>> rr.dispatch(vars)
|
||||
|
||||
"""
|
||||
|
||||
def __init__(self, pserver_endpoints):
|
||||
super().__init__(pserver_endpoints)
|
||||
|
||||
def _hash_block(self, block_str, total):
|
||||
return hash(block_str) % total
|
||||
|
||||
def dispatch(self, varlist):
|
||||
"""
|
||||
use `HashName` method to dispatch variables with each parameter server.
|
||||
Args:
|
||||
varlist (list): a list of Variables
|
||||
|
||||
"""
|
||||
eplist = []
|
||||
for var in varlist:
|
||||
server_id = self._hash_block(var.name(), len(self._eps))
|
||||
server_for_param = self._eps[server_id]
|
||||
eplist.append(server_for_param)
|
||||
return eplist
|
||||
|
||||
|
||||
class RoundRobin(PSDispatcher):
|
||||
"""
|
||||
Distribute variables to several endpoints using
|
||||
RondRobin<https://en.wikipedia.org/wiki/Round-robin_scheduling> method.
|
||||
|
||||
Args:
|
||||
pserver_endpoints (list): list of endpoint(ip:port).
|
||||
|
||||
Examples:
|
||||
.. code-block:: pycon
|
||||
|
||||
>>> from paddle.incubate.distributed.fleet.parameter_server.ir.ps_dispatcher import RoundRobin
|
||||
|
||||
>>> pserver_endpoints = ["127.0.0.1:6007", "127.0.0.1:6008"]
|
||||
>>> vars = ["var1", "var2", "var3", "var4", "var5"]
|
||||
|
||||
>>> rr = RoundRobin(pserver_endpoints)
|
||||
>>> rr.dispatch(vars)
|
||||
|
||||
"""
|
||||
|
||||
def __init__(self, pserver_endpoints):
|
||||
super().__init__(pserver_endpoints)
|
||||
|
||||
def dispatch(self, varlist):
|
||||
"""
|
||||
use `RoundRobin` method to dispatch variables with each parameter server.
|
||||
Args:
|
||||
varlist (list): a list of Variables
|
||||
|
||||
"""
|
||||
eplist = []
|
||||
for var in varlist:
|
||||
server_for_param = self._eps[self._step]
|
||||
eplist.append(server_for_param)
|
||||
self._step += 1
|
||||
if self._step >= len(self._eps):
|
||||
self._step = 0
|
||||
return eplist
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,64 @@
|
||||
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
class UnionFind:
|
||||
"""Union-find data structure.
|
||||
|
||||
Union-find is a data structure that keeps track of a set of elements partitioned
|
||||
into a number of disjoint (non-overlapping) subsets.
|
||||
|
||||
Reference:
|
||||
https://en.wikipedia.org/wiki/Disjoint-set_data_structure
|
||||
|
||||
Args:
|
||||
elements(list): The initialize element list.
|
||||
"""
|
||||
|
||||
def __init__(self, elements=None):
|
||||
self._parents = [] # index -> parent index
|
||||
self._index = {} # element -> index
|
||||
self._curr_idx = 0
|
||||
if not elements:
|
||||
elements = []
|
||||
for ele in elements:
|
||||
self._parents.append(self._curr_idx)
|
||||
self._index.update({ele: self._curr_idx})
|
||||
self._curr_idx += 1
|
||||
|
||||
def find(self, x):
|
||||
# Find the root index of given element x,
|
||||
# execute the path compress while finding the root index
|
||||
if x not in self._index:
|
||||
return -1
|
||||
idx = self._index[x]
|
||||
while idx != self._parents[idx]:
|
||||
t = self._parents[idx]
|
||||
self._parents[idx] = self._parents[t]
|
||||
idx = t
|
||||
return idx
|
||||
|
||||
def union(self, x, y):
|
||||
# Union two given element
|
||||
x_root = self.find(x)
|
||||
y_root = self.find(y)
|
||||
|
||||
if x_root == y_root:
|
||||
return
|
||||
self._parents[x_root] = y_root
|
||||
|
||||
def is_connected(self, x, y):
|
||||
# If two given elements have the same root index,
|
||||
# then they are connected.
|
||||
return self.find(x) == self.find(y)
|
||||
@@ -0,0 +1,206 @@
|
||||
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
from functools import reduce
|
||||
|
||||
from paddle.framework import core
|
||||
from paddle.framework.io import Variable
|
||||
|
||||
dtype_to_size = {
|
||||
core.VarDesc.VarType.FP16: 2,
|
||||
core.VarDesc.VarType.FP32: 4,
|
||||
core.VarDesc.VarType.FP64: 8,
|
||||
core.VarDesc.VarType.INT16: 2,
|
||||
core.VarDesc.VarType.INT32: 4,
|
||||
core.VarDesc.VarType.INT64: 8,
|
||||
core.VarDesc.VarType.BOOL: 1,
|
||||
core.VarDesc.VarType.UINT8: 1,
|
||||
}
|
||||
|
||||
|
||||
class VarBlock:
|
||||
def __init__(self, varname, offset, size):
|
||||
self.varname = varname
|
||||
# NOTE: real offset is offset * size
|
||||
self.offset = offset
|
||||
self.size = size
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.varname}:{int(self.offset)}:{int(self.size)}"
|
||||
|
||||
|
||||
def create_var_struct(var):
|
||||
if var.type == core.VarDesc.VarType.SELECTED_ROWS:
|
||||
lod_level = None
|
||||
elif var.type == core.VarDesc.VarType.DENSE_TENSOR:
|
||||
lod_level = var.lod_level
|
||||
else:
|
||||
raise ValueError("can only support SELECTED_ROWS/DENSE_TENSOR now")
|
||||
|
||||
return VarStruct(
|
||||
var.name, var.shape, var.dtype, var.type, lod_level, var.persistable
|
||||
)
|
||||
|
||||
|
||||
class VarStruct:
|
||||
"""
|
||||
record part properties of a Variable in python.
|
||||
"""
|
||||
|
||||
def __init__(self, name, shape, dtype, type, lod_level, persistable):
|
||||
self.name = name
|
||||
self.shape = shape
|
||||
self.dtype = dtype
|
||||
self.type = type
|
||||
self.lod_level = lod_level
|
||||
self.persistable = persistable
|
||||
self.m_size = 1
|
||||
self.m_size = reduce(lambda x, y: x * y, shape, 1)
|
||||
self.m_size *= dtype_to_size[dtype]
|
||||
|
||||
def __str__(self):
|
||||
return f"N: {self.name}, S: {self.shape}, D: {self.dtype}, T: {self.type}, LL: {self.lod_level}, P: {self.persistable}, M: {self.m_size}"
|
||||
|
||||
|
||||
class VarDistributed:
|
||||
"""
|
||||
a class to record the var distributed on parameter servers.
|
||||
the class will record the relationship between origin var and slice var.
|
||||
the slice var's properties, such as type/shape/offset/endpoint.
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
origin_var,
|
||||
slice_var,
|
||||
is_slice=None,
|
||||
block_id=None,
|
||||
offset=None,
|
||||
vtype=None,
|
||||
endpoint=None,
|
||||
):
|
||||
"""
|
||||
Args:
|
||||
origin_var(Variable|VarStruct): origin var properties
|
||||
slice_var(Variable|VarStruct): slice var properties
|
||||
is_slice(bool|None): slice or not, slice_var=True/False and its block size > 8192 are the judgement standard.
|
||||
block_id(int|None): the number about the slice var.
|
||||
offset(int|None): if the slice var is sliced, offset is the numel before the var.
|
||||
vtype(str|None): a tag, such as Optimizer/Param/RemotePrefetch.
|
||||
endpoint(str|None): which parameter the slice var on, such as "127.0.0.1:1001"
|
||||
"""
|
||||
|
||||
if isinstance(origin_var, Variable):
|
||||
self.origin = create_var_struct(origin_var)
|
||||
else:
|
||||
self.origin = origin_var
|
||||
|
||||
if isinstance(slice_var, Variable):
|
||||
self.slice = create_var_struct(slice_var)
|
||||
else:
|
||||
self.slice = slice_var
|
||||
|
||||
if self.equal(self.origin, self.slice):
|
||||
self.is_slice = False
|
||||
self.block_id = 0
|
||||
self.offset = 0
|
||||
else:
|
||||
self.is_slice = True
|
||||
self.block_id = 0
|
||||
self.offset = 0
|
||||
|
||||
if is_slice is not None:
|
||||
self.is_slice = is_slice
|
||||
if block_id is not None:
|
||||
self.block_id = block_id
|
||||
if offset is not None:
|
||||
self.offset = offset
|
||||
|
||||
self.vtype = vtype
|
||||
self.endpoint = endpoint
|
||||
|
||||
@staticmethod
|
||||
def equal(var1, var2):
|
||||
"""
|
||||
the two var is equal or not.
|
||||
Returns:
|
||||
bool: equal will return True else False
|
||||
"""
|
||||
assert isinstance(var1, VarStruct) and isinstance(var2, VarStruct)
|
||||
|
||||
return (
|
||||
var1.name == var2.name
|
||||
and var1.type == var2.type
|
||||
and var1.shape == var2.shape
|
||||
and var1.dtype == var2.dtype
|
||||
and var1.lod_level == var2.lod_level
|
||||
and var1.persistable == var2.persistable
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
origin_var_str = f"{self.origin.name} : base.{self.origin.type}.shape{self.origin.shape}.astype({self.origin.dtype})"
|
||||
|
||||
slice_var_str = (
|
||||
f"{self.slice.name} : base.{self.slice.type}.shape{self.slice.shape}.astype({self.slice.dtype})"
|
||||
f".slice({self.is_slice}).block({self.block_id}).offset({self.offset})"
|
||||
)
|
||||
|
||||
return f"var owned: {self.vtype}, origin var: ( {origin_var_str} ), slice var: ( {slice_var_str} ), endpoint: {self.endpoint} "
|
||||
|
||||
|
||||
class VarsDistributed:
|
||||
"""
|
||||
a gather about VarDistributed with many methods to find distributed vars.
|
||||
through the class, we can get overview about the distributed parameters on parameter servers.
|
||||
this class may centralized and convenient for developer to manage and get variable's distribute.
|
||||
other module can also use this to find variables such io.py.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.distributed_vars = []
|
||||
|
||||
def add_distributed_var(
|
||||
self,
|
||||
origin_var,
|
||||
slice_var,
|
||||
is_slice=None,
|
||||
block_id=None,
|
||||
offset=None,
|
||||
vtype=None,
|
||||
endpoint=None,
|
||||
):
|
||||
"""
|
||||
add distributed var in this.
|
||||
|
||||
Args:
|
||||
origin_var(Variable|VarStruct): origin var properties
|
||||
slice_var(Variable|VarStruct): slice var properties
|
||||
is_slice(bool|None): slice or not, slice_var=True/False and its block size > 8192 are the judgement standard.
|
||||
block_id(int|None): the number about the slice var.
|
||||
offset(int|None): if the slice var is sliced, offset is the numel before the var.
|
||||
vtype(str|None): a tag, such as Optimizer/Param/RemotePrefetch.
|
||||
endpoint(str|None): which parameter the slice var on, such as "127.0.0.1:1001"
|
||||
Returns:
|
||||
None
|
||||
"""
|
||||
self.distributed_vars.append(
|
||||
VarDistributed(
|
||||
origin_var,
|
||||
slice_var,
|
||||
is_slice,
|
||||
block_id,
|
||||
offset,
|
||||
vtype,
|
||||
endpoint,
|
||||
)
|
||||
)
|
||||
Reference in New Issue
Block a user