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

Slice Layer #3126

Merged
merged 8 commits into from
Aug 1, 2017
Merged
Show file tree
Hide file tree
Changes from 4 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
96 changes: 96 additions & 0 deletions paddle/gserver/layers/SliceProjection.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/* 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 "Projection.h"

namespace paddle {

/**
* SliceProjection can slice the input value into multiple parts,
* and then select some of them to merge into a new output.
*
* First, calculate the slices that need to be merged into the output.
* slices = input.slices().for_output()
*
* Second, merge each slice into the output.
* for(auto slice: slices) {
* out.addAtOffset(slice, offset);
* }
*
* Input slices as output: s0, s1, ...:
* -----------------------
* |///| |//////| |
* |/s0| |//s1//| |
* |///| |//////| |
* -----------------------
* Output, merge s0, s1, ... into one output:
* ----------------
* |///|//////| |
* |/s0|//s1//|...|
* |///|//////| |
* ----------------
*
* The config file api is slice_projection.
*/
class SliceProjection : public Projection {
public:
SliceProjection(const ProjectionConfig& config,
const ParameterPtr& parameter,
bool useGpu);
virtual void forward();
virtual void backward(const UpdateCallback& callback);

protected:
std::vector<std::pair<size_t, size_t>> slices_;
};

REGISTER_PROJECTION(slice, SliceProjection);

/**
* Constructed function.
* @note SliceProjection should not have any parameter.
*/
SliceProjection::SliceProjection(const ProjectionConfig& config,
const ParameterPtr& parameter,
bool useGpu)
: Projection(config, parameter, useGpu) {
CHECK(!parameter) << "'slice' projection should not have any parameter";

slices_.reserve(config.slices_size());
for (const auto& slice : config.slices()) {
slices_.push_back(std::make_pair(slice.start(), slice.end()));
}
}

void SliceProjection::forward() {
Copy link
Contributor

Choose a reason for hiding this comment

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

是不是少了一个check,output_的size,得和每个slice的大小相加后的值一样。

Copy link
Contributor Author

@hedaoyuan hedaoyuan Aug 1, 2017

Choose a reason for hiding this comment

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

SliceProjection 585行里面已经保证了,output_.size是所有slices.size的和。

size_t offset = 0;
for (auto& slice : slices_) {
auto slice_out = in_->value->subColMatrix(slice.first, slice.second);
Copy link
Contributor

Choose a reason for hiding this comment

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

这里的first, second能用start(), end()来表示么?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

这个不行,first, secondstd::pair的成员变量。

out_->value->addAtOffset(*slice_out, offset);
offset += slice_out->getWidth();
}
}

void SliceProjection::backward(const UpdateCallback& callback) {
if (in_->grad) {
size_t offset = 0;
for (auto& slice : slices_) {
auto slice_out = in_->grad->subColMatrix(slice.first, slice.second);
slice_out->addAtOffset(*out_->grad, config_.offset());
offset += slice_out->getWidth();
}
}
}

} // namespace paddle
20 changes: 20 additions & 0 deletions paddle/gserver/tests/test_LayerGrad.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,26 @@ TEST(Projection, identity) {
}
}

TEST(Projection, slice) {
ProjectionConfig conf;
conf.set_type("slice");
conf.set_input_size(100);
SliceConfig& slice1 = *conf.add_slices();
slice1.set_start(10);
slice1.set_end(20);
SliceConfig& slice2 = *conf.add_slices();
slice2.set_start(50);
slice2.set_end(70);
conf.set_output_size(30);
for (auto useGpu : {false, true}) {
testProjectionGrad(conf,
INPUT_DATA,
/* parameterSize */ 0,
/* batchSize */ 100,
useGpu);
}
}

TEST(Projection, scaling) {
ProjectionConfig conf;
conf.set_type("scaling");
Expand Down
9 changes: 9 additions & 0 deletions proto/ModelConfig.proto
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ message RowConvConfig {
required uint32 context_length = 1;
}

message SliceConfig {
required uint32 start = 1;
required uint32 end = 2;
}

message ProjectionConfig {
required string type = 1;
required string name = 2;
Expand All @@ -218,6 +223,10 @@ message ProjectionConfig {

// For pool
optional PoolConfig pool_conf = 12;

// For slice
// Each slice output is the input[start, end)
repeated SliceConfig slices = 13;
}

message OperatorConfig {
Expand Down
29 changes: 29 additions & 0 deletions python/paddle/trainer/config_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,35 @@ def calc_parameter_dims(self, input_size, output_size):
return []


@config_class
class SliceProjection(Projection):
type = 'slice'

def __init__(self, input_layer_name, slices, **xargs):
super(SliceProjection, self).__init__(input_layer_name, **xargs)
input = g_layer_map[input_layer_name]
if input.type in ["exconv", "cudnn_conv"]:
# the slice operator is for the channel dimension
assert input.num_filters is not None
channels = input.num_filters
image_size = input.size / channels
assert slices[len(slices) - 1][1] <= channels
for i in xrange(len(slices)):
slice = self.proj_conf.slices.add()
slice.start = slices[i][0] * image_size
slice.end = slices[i][1] * image_size
self.size += slice.end - slice.start
else:
config_assert(False,
'Currently the input should be convolution layer')

def calc_parameter_size(self, input_size, output_size):
return 0

def calc_parameter_dims(self, input_size, output_size):
return []


# DotMulProjection performs element-wise multiplication with weight
@config_class
class DotMulProjection(Projection):
Expand Down
40 changes: 40 additions & 0 deletions python/paddle/trainer_config_helpers/layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
'prelu_layer',
'gated_unit_layer',
'crop_layer',
'slice_projection',
]


Expand Down Expand Up @@ -536,6 +537,45 @@ def identity_projection(input, offset=None, size=None):
return proj


def slice_projection(input, slices):
"""
slice_projection can slice the input value into multiple parts,
and then select some of them to merge into a new output.

.. math::
output = [input.slices()]

The example usage is:

.. code-block:: python

proj = slice_projection(input=layer, slices=[(0, 10), (20, 30)])

Note that slice_projection should not have any parameter.

:param input: Input Layer.
:type input: LayerOutput
:param slices: An array of slice parameters.
Each slice contains the start and end offsets based
on the input.
:type offset: pair of int
Copy link
Contributor

Choose a reason for hiding this comment

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

type offset->type slices,笔误

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.

:return: A SliceProjection object
:rtype: SliceProjection
"""
assert len(slices) >= 1
start = 0
for i in xrange(len(slices)):
assert len(slices[i]) == 2
# The start position of the next slice needs to be greater than
# or equal to the end position of the previous slice.
assert slices[i][0] >= start
assert slices[i][1] >= slices[i][0]
start = slices[i][1]
Copy link
Contributor

Choose a reason for hiding this comment

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

这里检查了start,end要检查么,可以只检查最后一个end有没有越界。

Copy link
Contributor Author

@hedaoyuan hedaoyuan Aug 1, 2017

Choose a reason for hiding this comment

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

slices[i][1] >= slices[i][0]这句检查的是每个slice的end要大于等于start,如果end<start就直接报错了。
最后一个end有没有越界,在SliceProjection 580行检查了最后一个end有没有越界,这里还没法判断。

proj = SliceProjection(input_layer_name=input.name, slices=slices)
proj.origin = input
return proj


@wrap_param_attr_default()
def scaling_projection(input, param_attr=None):
"""
Expand Down