supports distributed classification (#18690)
* supports distributed classification training * update API.spec * fix evenly division in python3 * change "index_range" to "index_num" in shard_index operator test=document_preview test=developDDDivano-patch-1
Yi Liu
6 years ago
committed by
GitHub
parent
3429e65aa8
commit
157211c4e1
@ -0,0 +1,115 @@
|
|||||||
|
// Copyright (c) 2019 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.
|
||||||
|
|
||||||
|
#include "paddle/fluid/operators/shard_index_op.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace operators {
|
||||||
|
|
||||||
|
class ShardIndexOp : public framework::OperatorWithKernel {
|
||||||
|
public:
|
||||||
|
using framework::OperatorWithKernel::OperatorWithKernel;
|
||||||
|
void InferShape(framework::InferShapeContext* ctx) const override {
|
||||||
|
PADDLE_ENFORCE(ctx->HasInput("X"),
|
||||||
|
"Input(X) of ShardIndexOp should not be null.");
|
||||||
|
PADDLE_ENFORCE(ctx->HasOutput("Out"),
|
||||||
|
"Output(Out) of ShardIndexOp should not be null.");
|
||||||
|
|
||||||
|
auto x_dims = ctx->GetInputDim("X");
|
||||||
|
PADDLE_ENFORCE_GE(x_dims.size(), 2,
|
||||||
|
"Rank of Input(X) should be at least 2.");
|
||||||
|
if (ctx->IsRuntime() || x_dims[x_dims.size() - 1] > 0) {
|
||||||
|
PADDLE_ENFORCE_GE(x_dims[x_dims.size() - 1], 1U,
|
||||||
|
"Last dimension of Input(X) should be 1.");
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx->SetOutputDim("Out", x_dims);
|
||||||
|
ctx->ShareLoD("X", /* --> */ "Out");
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
framework::OpKernelType GetExpectedKernelType(
|
||||||
|
const framework::ExecutionContext& ctx) const override {
|
||||||
|
return framework::OpKernelType(ctx.Input<framework::Tensor>("X")->type(),
|
||||||
|
ctx.device_context());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class ShardIndexOpMaker : public framework::OpProtoAndCheckerMaker {
|
||||||
|
public:
|
||||||
|
void Make() override {
|
||||||
|
AddInput("X",
|
||||||
|
"(LoDTensor, LoDTensor<int|int64>) Input variable. Each value "
|
||||||
|
"of X is an index.");
|
||||||
|
AddOutput(
|
||||||
|
"Out",
|
||||||
|
"(Tensor, Tensor<int|int64>) Output tensor with same shape as X. "
|
||||||
|
"The tensor consists of sharding representations of values in X.");
|
||||||
|
AddAttr<int>("index_num",
|
||||||
|
"A positive integer to specify the range of the input X.");
|
||||||
|
|
||||||
|
AddAttr<int>("nshards",
|
||||||
|
"A positive integer to specify the number of shards.");
|
||||||
|
AddAttr<int>("shard_id", "The current shard id");
|
||||||
|
AddAttr<int>("ignore_value", "An ingeter value out of sharded range")
|
||||||
|
.SetDefault(-1);
|
||||||
|
AddComment(R"DOC(
|
||||||
|
This layer creates the sharded index for input. This layers is used in
|
||||||
|
model- and data- parallel mixed training generally, in which the index
|
||||||
|
data (usually the label) should be recaculated in each trainer according
|
||||||
|
to
|
||||||
|
|
||||||
|
.. math::
|
||||||
|
|
||||||
|
assert index_num % nshards == 0
|
||||||
|
|
||||||
|
shard_size = index_num / nshards
|
||||||
|
|
||||||
|
y = x % shard_size if x / shard_size == shard_id else ignore_value
|
||||||
|
|
||||||
|
We take the distributed one-hot representation to show what this layer is
|
||||||
|
used for. The distributed one-hot representation is seperated into multiple
|
||||||
|
shards, and each shard is filling zeros except the one with the index
|
||||||
|
inside. In order to create these sharded representation in each trainer,
|
||||||
|
the original index should be recalculated (i.e. sharded) before.
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
X is a Tensor of integer values:
|
||||||
|
X.shape = [4, 1]
|
||||||
|
X.data = [[1], [6], [12], [19]]
|
||||||
|
|
||||||
|
suppose index_num = 20 and nshards = 2, then we get shard_size = 10
|
||||||
|
|
||||||
|
if shard_id == 0, we get the Out:
|
||||||
|
Out.shape = [4, 1]
|
||||||
|
Out.data = [[1], [6], [-1], [-1]]
|
||||||
|
|
||||||
|
if shard_id == 1, we get the Out:
|
||||||
|
Out.shape = [4, 1]
|
||||||
|
Out.data = [[-1], [-1], [2], [9]]
|
||||||
|
|
||||||
|
the default `ignore_value` -1 is used in this example.
|
||||||
|
)DOC");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace operators
|
||||||
|
} // namespace paddle
|
||||||
|
|
||||||
|
namespace ops = paddle::operators;
|
||||||
|
REGISTER_OP_WITHOUT_GRADIENT(shard_index, ops::ShardIndexOp,
|
||||||
|
ops::ShardIndexOpMaker);
|
||||||
|
REGISTER_OP_CPU_KERNEL(shard_index, ops::ShardIndexCPUKernel<int>,
|
||||||
|
ops::ShardIndexCPUKernel<int64_t>);
|
||||||
@ -0,0 +1,77 @@
|
|||||||
|
// Copyright (c) 2019 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.
|
||||||
|
|
||||||
|
#include "paddle/fluid/operators/shard_index_op.h"
|
||||||
|
#include "paddle/fluid/platform/cuda_primitives.h"
|
||||||
|
#include "paddle/fluid/platform/gpu_info.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace operators {
|
||||||
|
|
||||||
|
using platform::PADDLE_CUDA_NUM_THREADS;
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
__global__ void ShardIndexInner(const T* in_data, T* out_data,
|
||||||
|
const int64_t numel, const int index_num,
|
||||||
|
const int nshards, const int shard_id,
|
||||||
|
const int ignore_value) {
|
||||||
|
int shard_size = index_num / nshards;
|
||||||
|
int idx = blockIdx.x * blockDim.x + threadIdx.x;
|
||||||
|
if (idx < numel) {
|
||||||
|
assert(in_data[idx] >= 0 && in_data[idx] < index_num);
|
||||||
|
if (in_data[idx] / shard_size == shard_id) {
|
||||||
|
out_data[idx] = in_data[idx] % shard_size;
|
||||||
|
} else {
|
||||||
|
out_data[idx] = ignore_value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
using LoDTensor = framework::LoDTensor;
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
class ShardIndexCUDAKernel : public framework::OpKernel<T> {
|
||||||
|
public:
|
||||||
|
void Compute(const framework::ExecutionContext& context) const override {
|
||||||
|
auto* in = context.Input<LoDTensor>("X");
|
||||||
|
auto* out = context.Output<LoDTensor>("Out");
|
||||||
|
int index_num = context.Attr<int>("index_num");
|
||||||
|
int nshards = context.Attr<int>("nshards");
|
||||||
|
int shard_id = context.Attr<int>("shard_id");
|
||||||
|
int ignore_value = context.Attr<int>("ignore_value");
|
||||||
|
PADDLE_ENFORCE_GT(index_num, 0);
|
||||||
|
PADDLE_ENFORCE_GT(nshards, 0);
|
||||||
|
PADDLE_ENFORCE(shard_id >= 0 && shard_id < nshards,
|
||||||
|
"shard_id(%d) is not in range [0, %d)", shard_id, nshards);
|
||||||
|
|
||||||
|
out->Resize(in->dims());
|
||||||
|
out->set_lod(in->lod());
|
||||||
|
auto* in_data = in->data<T>();
|
||||||
|
auto* out_data = out->mutable_data<T>(context.GetPlace());
|
||||||
|
int64_t numel = in->numel();
|
||||||
|
auto stream =
|
||||||
|
context.template device_context<platform::CUDADeviceContext>().stream();
|
||||||
|
ShardIndexInner<<<(numel + PADDLE_CUDA_NUM_THREADS - 1) /
|
||||||
|
PADDLE_CUDA_NUM_THREADS,
|
||||||
|
PADDLE_CUDA_NUM_THREADS, 0, stream>>>(
|
||||||
|
in_data, out_data, numel, index_num, nshards, shard_id, ignore_value);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace operators
|
||||||
|
} // namespace paddle
|
||||||
|
|
||||||
|
namespace ops = paddle::operators;
|
||||||
|
REGISTER_OP_CUDA_KERNEL(shard_index, ops::ShardIndexCUDAKernel<int>,
|
||||||
|
ops::ShardIndexCUDAKernel<int64_t>);
|
||||||
@ -0,0 +1,58 @@
|
|||||||
|
// Copyright (c) 2019 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.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "paddle/fluid/framework/op_registry.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace operators {
|
||||||
|
|
||||||
|
using LoDTensor = framework::LoDTensor;
|
||||||
|
template <typename T>
|
||||||
|
class ShardIndexCPUKernel : public framework::OpKernel<T> {
|
||||||
|
public:
|
||||||
|
void Compute(const framework::ExecutionContext& context) const override {
|
||||||
|
auto* in = context.Input<LoDTensor>("X");
|
||||||
|
auto* out = context.Output<LoDTensor>("Out");
|
||||||
|
int index_num = context.Attr<int>("index_num");
|
||||||
|
int nshards = context.Attr<int>("nshards");
|
||||||
|
int shard_id = context.Attr<int>("shard_id");
|
||||||
|
int ignore_value = context.Attr<int>("ignore_value");
|
||||||
|
PADDLE_ENFORCE_GT(index_num, 0);
|
||||||
|
PADDLE_ENFORCE_GT(nshards, 0);
|
||||||
|
PADDLE_ENFORCE(shard_id >= 0 && shard_id < nshards,
|
||||||
|
"shard_id(%d) is not in range [0, %d)", shard_id, nshards);
|
||||||
|
|
||||||
|
int shard_size = index_num / nshards;
|
||||||
|
|
||||||
|
out->Resize(in->dims());
|
||||||
|
out->set_lod(in->lod());
|
||||||
|
auto* in_data = in->data<T>();
|
||||||
|
auto* out_data = out->mutable_data<T>(context.GetPlace());
|
||||||
|
int64_t numel = in->numel();
|
||||||
|
for (int64_t i = 0; i < numel; ++i) {
|
||||||
|
PADDLE_ENFORCE(in_data[i] >= 0 && in_data[i] < index_num,
|
||||||
|
"Input index(%d) is out of range [0,%d)", in_data[i],
|
||||||
|
index_num);
|
||||||
|
if (in_data[i] / shard_size == shard_id) {
|
||||||
|
out_data[i] = in_data[i] % shard_size;
|
||||||
|
} else {
|
||||||
|
out_data[i] = ignore_value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace operators
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,85 @@
|
|||||||
|
# Copyright (c) 2019 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 __future__ import print_function
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
import numpy as np
|
||||||
|
import math
|
||||||
|
from op_test import OpTest
|
||||||
|
import paddle.fluid as fluid
|
||||||
|
import paddle.fluid.core as core
|
||||||
|
import paddle.fluid.framework as framework
|
||||||
|
from paddle.fluid.framework import Program, program_guard
|
||||||
|
|
||||||
|
|
||||||
|
def common_setup(self, index_num, nshards, shard_id, ignore_value):
|
||||||
|
self.op_type = 'shard_index'
|
||||||
|
x_lod = [[i for i in range(10)]]
|
||||||
|
N = sum(x_lod[0])
|
||||||
|
x = [np.random.randint(0, index_num - 1) for i in range(N)]
|
||||||
|
x = np.array(x).astype('int32').reshape([N, 1])
|
||||||
|
|
||||||
|
shard_size = index_num // nshards
|
||||||
|
out = np.zeros(shape=x.shape).astype('int32')
|
||||||
|
for i in range(N):
|
||||||
|
if x[i] // shard_size == shard_id:
|
||||||
|
out[i] = x[i] % shard_size
|
||||||
|
else:
|
||||||
|
out[i] = ignore_value
|
||||||
|
|
||||||
|
self.inputs = {'X': (x, x_lod)}
|
||||||
|
self.attrs = {
|
||||||
|
'index_num': index_num,
|
||||||
|
'nshards': nshards,
|
||||||
|
'shard_id': shard_id,
|
||||||
|
'ignore_value': ignore_value
|
||||||
|
}
|
||||||
|
self.outputs = {'Out': (out, x_lod)}
|
||||||
|
|
||||||
|
|
||||||
|
class TestShardIndexShardId0Op(OpTest):
|
||||||
|
def setUp(self):
|
||||||
|
common_setup(self, 20, 2, 0, -1)
|
||||||
|
|
||||||
|
def test_check_output(self):
|
||||||
|
self.check_output()
|
||||||
|
|
||||||
|
|
||||||
|
class TestShardIndexShardId1Op(OpTest):
|
||||||
|
def setUp(self):
|
||||||
|
common_setup(self, 20, 2, 1, -1)
|
||||||
|
|
||||||
|
def test_check_output(self):
|
||||||
|
self.check_output()
|
||||||
|
|
||||||
|
|
||||||
|
class TestShardIndexIgnoreValueOp(OpTest):
|
||||||
|
def setUp(self):
|
||||||
|
common_setup(self, 20, 2, 0, -2)
|
||||||
|
|
||||||
|
def test_check_output(self):
|
||||||
|
self.check_output()
|
||||||
|
|
||||||
|
|
||||||
|
class TestShardIndexNotEvenlyDividedOp(OpTest):
|
||||||
|
def setUp(self):
|
||||||
|
common_setup(self, 15, 2, 1, -1)
|
||||||
|
|
||||||
|
def test_check_output(self):
|
||||||
|
self.check_output()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
Loading…
Reference in new issue