Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sequence slice operator #5546

Merged
merged 23 commits into from
Nov 20, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
23b0388
add sub sequence operator code and unittest
Nov 9, 2017
f23d6cc
update the sub_sequence_op tp sequence_slice_op code.
Nov 14, 2017
b24afd8
update the sub_sequence_op to sequence_slice_op code.
Nov 14, 2017
8e7c8bb
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Nov 14, 2017
29c2582
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Nov 14, 2017
9a18e78
update sequence slice op, fix some error
Nov 14, 2017
4c426f1
update sequence_slice_op.h, change some code
Nov 15, 2017
40a6c48
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Nov 16, 2017
3dcf0da
change offset and length's rank to 2, dim[0] for batch size
Nov 16, 2017
1d95173
change offset and length's rank to 2, dim[0] for batch size
Nov 16, 2017
7bb2680
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Nov 16, 2017
4579bd4
Merge branch 'sub_sequence_op' of https://github.com/wanghaox/Paddle …
Nov 16, 2017
352c5a9
update some code
Nov 16, 2017
069dcc2
Merge branch 'sub_sequence_op' of https://github.com/wanghaox/Paddle …
Nov 16, 2017
49a5942
fix some typos
Nov 16, 2017
294570f
Merge branch 'sub_sequence_op' of https://github.com/wanghaox/Paddle …
Nov 16, 2017
a0b7a07
fix some comments
Nov 16, 2017
06dc89e
Merge branch 'sub_sequence_op' of https://github.com/wanghaox/Paddle …
Nov 16, 2017
3603546
fix some codes
Nov 17, 2017
39bce49
fix some comments
Nov 20, 2017
794117b
fix some comments
Nov 20, 2017
f7c1562
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Nov 20, 2017
d68f861
fix some comments
Nov 20, 2017
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
99 changes: 99 additions & 0 deletions paddle/operators/sub_sequence_op.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.

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/operators/sub_sequence_op.h"
Copy link
Contributor

@qingqing01 qingqing01 Nov 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have:

sequence_conv_op
sequence_pool_op
sequence_softmax_op
...

so, maybe rename to sequence_slice_op ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sequence_slice_op sounds good.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, rename to sequence_slice_op


namespace paddle {
namespace operators {

class SubSequenceOp : public framework::OperatorWithKernel {
public:
using framework::OperatorWithKernel::OperatorWithKernel;

void InferShape(framework::InferShapeContext* ctx) const override {
PADDLE_ENFORCE(ctx->HasInput("X"),
"Input(X) of SubSequenceOp should not be null.");
PADDLE_ENFORCE(ctx->HasOutput("Out"),
"Output(Out) of SubSequenceOp should not be null.");
auto input_dims = ctx->GetInputDim("X");

auto offsets = ctx->Attrs().Get<std::vector<int>>("offset");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ensure offsets value is valid.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed from ctx->Attrs() to input tensor

auto sizes = ctx->Attrs().Get<std::vector<int>>("size");
Copy link
Contributor

@qingqing01 qingqing01 Nov 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the raw Paddle Layer, the offset and size are the input, not attributes. Since they may be changed during each mini-batch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, I think it's better to use 'length' instead of 'size'.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


auto dim_0 = 0;
for (size_t i = 0; i < sizes.size(); ++i) {
dim_0 += sizes[i];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ensure sizes[i] is greater than zero.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, added the PADDLE_ENFORCE_LT check

}

framework::DDim out_dims = input_dims;
out_dims[0] = dim_0;
ctx->SetOutputDim("Out", out_dims);
}
};

class SubSequenceGradOp : public framework::OperatorWithKernel {
public:
using framework::OperatorWithKernel::OperatorWithKernel;

void InferShape(framework::InferShapeContext* ctx) const override {
PADDLE_ENFORCE(ctx->HasInput(framework::GradVarName("Out")),
"The gradient of Out should not be null.");
PADDLE_ENFORCE(ctx->HasOutputs(framework::GradVarName("X")),
"The gradient of X should not be null.");
ctx->SetOutputsDim(framework::GradVarName("X"), ctx->GetInputsDim("X"));
}
};

class SubSequenceOpMaker : public framework::OpProtoAndCheckerMaker {
public:
SubSequenceOpMaker(framework::OpProto* proto,
framework::OpAttrChecker* op_checker)
: OpProtoAndCheckerMaker(proto, op_checker) {
AddInput("X", "(LoDTensor), "
"the variable-length input of SubSequenceOp");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget to put a full stop.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

AddAttr<std::vector<int>>(
"offset",
"A list<int> to describes offset for sub sequence item.");
AddAttr<std::vector<int>>(
"size",
"A list<int> to describes size for sub sequence item.");
AddOutput("Out",
"(Tensor), Variable-length output of "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Out" should be LoDTensor. And AddOutput("Out",... should be wrote behind AddInput("X", "(LoDTensor), ....

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

"sequence_concat Op.");
AddComment(R"DOC(
Sub Sequence operator

The operator crop a subsequence from given sequence with given start offset and subsequence size.
It only supports sequence (LoD Tensor with level number is 1).
- Case:
LoD(x) = {{0, 3, 6, 10}}; Dims(x0) = (10, 3, 2)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dims(x0) -> Dims(x)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The example case has been rewritten

offset = (0, 1, 1); size = (2, 1, 2)
LoD(Out) = {{0, 2, 3, 5}}; Dims(Out) = (5,3,2)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is better to write the case concretely, like context_project.

NOTE: The length of the input, offset and size should be the same. The offset start from 0.
)DOC");
}
};

} // namespace operators
} // namespace paddle

namespace ops = paddle::operators;
REGISTER_OP(sub_sequence, ops::SubSequenceOp, ops::SubSequenceOpMaker,
sub_sequence_grad, ops::SubSequenceGradOp);
REGISTER_OP_CPU_KERNEL(
sub_sequence,
ops::SubSequenceOpKernel<paddle::platform::CPUPlace, float>);
REGISTER_OP_CPU_KERNEL(
sub_sequence_grad,
ops::SubSequenceGradOpKernel<paddle::platform::CPUPlace, float>);
25 changes: 25 additions & 0 deletions paddle/operators/sub_sequence_op.cu
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.

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. */

#define EIGEN_USE_GPU
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this line, since there is no Eigen function in the .h file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


#include "paddle/operators/sub_sequence_op.h"

namespace ops = paddle::operators;
REGISTER_OP_GPU_KERNEL(
sub_sequence,
ops::SubSequenceOpKernel<paddle::platform::GPUPlace, float>);
REGISTER_OP_GPU_KERNEL(
sub_sequence_grad,
ops::SubSequenceGradOpKernel<paddle::platform::GPUPlace, float>);
156 changes: 156 additions & 0 deletions paddle/operators/sub_sequence_op.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.

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/framework/eigen.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this line, since not use the Eigen function.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

#include "paddle/framework/op_registry.h"
#include "paddle/operators/strided_memcpy.h"

namespace paddle {
namespace operators {

using Tensor = framework::Tensor;
using LoDTensor = framework::LoDTensor;
using LoD = framework::LoD;

template <typename T>
LoD subsequenceLoD(const T* in, const std::vector<int> offsets,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Function name should follow the rule of "Camel Case".
  2. const T* in -> const Lod& outl_lod

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function name has been changed.

const std::vector<int> sizes) {
auto out_lod = in->lod();
size_t lod_offset = 0;

auto n = in->lod()[0].size() - 1;
out_lod[0][0] = 0;
for (size_t i = 0; i < n; ++i) {
lod_offset += sizes[i];
out_lod[0][i+1] = lod_offset;
}
return out_lod;
}

template <typename Place, typename T>
class SubSequenceOpKernel : public framework::OpKernel<T> {
public:
void Compute(const framework::ExecutionContext& ctx) const override {
auto* in = ctx.Input<LoDTensor>("X");
std::vector<int> offsets = ctx.Attr<std::vector<int>>("offset");
std::vector<int> sizes = ctx.Attr<std::vector<int>>("size");
auto* out = ctx.Output<LoDTensor>("Out");

auto offset_len = offsets.size();
auto size_len = sizes.size();

auto lod = in->lod();
auto n = lod[0].size() - 1;

PADDLE_ENFORCE_EQ(lod.size(), 1UL, "Only support one level sequence now.");
PADDLE_ENFORCE_EQ(n, offset_len,
"The length of input and offset should be the same")
PADDLE_ENFORCE_EQ(n, size_len,
"The length of input and size should be the same")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why n, offset_len and n, size_len should be equal.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The three is working on the same sequence.


for (size_t i = 0; i < n; ++i) {
auto offset = offsets[i];
auto size = sizes[i];
PADDLE_ENFORCE_LT(lod[0][i] + offset + size, lod[0][i + 1],
"The target tensor's length overflow")
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is better to put lines 63~68 into InferShape. Because InferShape is running in compiling time, if the config (size and offset) is wrong, user can check out mistakes in time.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The offset and length have been changed to input tensor, so they must be checked in the runtime.


out->mutable_data<T>(ctx.GetPlace());
auto out_lod = subsequenceLoD(in, offsets, sizes);
out->set_lod(out_lod);

auto in_stride = framework::stride(in->dims());
auto out_stride = framework::stride(out->dims());

size_t out_offset = 0;
for (size_t i = 0; i < n; ++i) {
auto offset = offsets[i];
auto size = sizes[i];

Tensor in_t = in->Slice(static_cast<int>(lod[0][i] + offset),
static_cast<int>(lod[0][i] + offset + size));

StridedMemcpy<T>(ctx.device_context(), in_t.data<T>(),
in_stride, in_t.dims(), out_stride,
out->data<T>() + out_offset);
out_offset += size * in_stride[0];
}
}
};

template <typename Place, typename T>
class SubSequenceGradOpKernel : public framework::OpKernel<T> {
public:
void Compute(const framework::ExecutionContext& ctx) const override {
auto* in = ctx.Input<LoDTensor>("X");
std::vector<int> offsets = ctx.Attr<std::vector<int>>("offset");
std::vector<int> sizes = ctx.Attr<std::vector<int>>("size");
auto* out_grad =
ctx.Input<framework::LoDTensor>(framework::GradVarName("Out"));
auto* x_grad =
ctx.Output<framework::LoDTensor>(framework::GradVarName("X"));

auto offset_len = offsets.size();
auto size_len = sizes.size();

auto lod = in->lod();
auto n = lod[0].size() - 1;

// check input data format
PADDLE_ENFORCE_EQ(lod.size(), 1UL, "Only support one level sequence now.");
PADDLE_ENFORCE_EQ(n, offset_len,
"The length of input and offset should be the same")
PADDLE_ENFORCE_EQ(n, size_len,
"The length of input and size should be the same")

for (size_t i = 0; i < n; ++i) {
auto offset = offsets[i];
auto size = sizes[i];
PADDLE_ENFORCE_LT(lod[0][i] + offset + size, lod[0][i + 1],
"The target tensor's length overflow")
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think lines 111~123 are unnecessary. Because you have done these in SubSequenceOpKernel.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


auto out_lod = subsequenceLoD(in, offsets, sizes);

x_grad->set_lod(lod);
x_grad->mutable_data<T>(ctx.GetPlace());
auto temp = framework::EigenVector<T>::Flatten(*x_grad);
temp.device(ctx.GetEigenDevice<Place>()) = temp.constant(static_cast<T>(0));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


auto out_grad_stride = framework::stride(out_grad->dims());

for (size_t i = 0; i < out_lod[0].size() - 1; ++i) {
Tensor out_grad_t =
out_grad->Slice(static_cast<int>(out_lod[0][i]),
static_cast<int>(out_lod[0][i + 1]));
auto out_grad_stride = framework::stride(out_grad_t.dims());

auto x_grad_stride = framework::stride(x_grad->dims());

auto offset = offsets[i];
auto size = sizes[i];
Copy link
Contributor

@chengduoZH chengduoZH Nov 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The variables of size and offset are unnecessary.


Tensor x_grad_t = x_grad->Slice(static_cast<int>(lod[0][i] + offset),
static_cast<int>(lod[0][i] + offset + size));

StridedMemcpy<T>(ctx.device_context(), out_grad_t.data<T>(),
out_grad_stride, out_grad_t.dims(), x_grad_stride,
x_grad_t.data<T>());
}
}
};

} // namespace operators
} // namespace paddle
40 changes: 40 additions & 0 deletions python/paddle/v2/framework/tests/test_sub_sequence_op.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import unittest
import numpy as np
import sys
from op_test import OpTest

class TestSubSequenceOp(OpTest):
def set_data(self):
# only supprot one level LoD
x = np.random.random((100, 3, 2)).astype('float32')
lod = [[0, 20, 40, 60, 80, 100]]
offsets = np.array([1, 2, 3, 4, 5]).flatten()
sizes = np.array([10, 8, 6, 4, 2]).flatten()

self.inputs = {'X': (x, lod)}
self.attrs = {'offset': offsets, 'size': sizes}
outs = []
out_lod = [[0]]
out_lod_offset = 0
for i in range(len(offsets)):
sub_x = x[lod[0][i] + offsets[i]: lod[0]
[i] + offsets[i] + sizes[i], :]
outs.append(sub_x)
out_lod_offset = out_lod_offset + len(sub_x)
out_lod[0].append(out_lod_offset)

outs = np.concatenate(outs, axis=0)
self.outputs = {'Out': outs}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also check the output LoD.

self.outputs = {'Out': (outs, out_lod)}


def setUp(self):
self.op_type = "sub_sequence"
self.set_data()

def test_check_output(self):
self.check_output()

def test_check_grad(self):
self.check_grad(['X'], 'Out')

if __name__ == '__main__':
unittest.main()