Merge branch 'dist-table-do-not-init-on-trainer' of ssh://github.com/jacquesqiao/Paddle into cpu-for-1.1-merge
Qiao Longfei
6 years ago
commit
641369f92b
@ -0,0 +1,86 @@
|
||||
/* 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. */
|
||||
|
||||
#include "paddle/fluid/framework/data_type.h"
|
||||
#include "paddle/fluid/framework/op_registry.h"
|
||||
#include "paddle/fluid/operators/math/math_function.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace operators {
|
||||
|
||||
class FakeInitInferShape : public framework::InferShapeBase {
|
||||
public:
|
||||
void operator()(framework::InferShapeContext *ctx) const override {
|
||||
PADDLE_ENFORCE(ctx->HasOutput("Out"),
|
||||
"Output(Out) of FakeInitOp should not be null.");
|
||||
auto &shape = ctx->Attrs().Get<std::vector<int64_t>>("shape");
|
||||
ctx->SetOutputDim("Out", framework::make_ddim(shape));
|
||||
}
|
||||
};
|
||||
|
||||
class FakeInitOp : public framework::OperatorBase {
|
||||
public:
|
||||
using framework::OperatorBase::OperatorBase;
|
||||
|
||||
private:
|
||||
void RunImpl(const framework::Scope &scope,
|
||||
const platform::Place &dev_place) const override {
|
||||
framework::Tensor *tensor = nullptr;
|
||||
|
||||
auto &out_var = *scope.FindVar(Output("Out"));
|
||||
|
||||
if (out_var.IsType<framework::LoDTensor>()) {
|
||||
tensor = out_var.GetMutable<framework::LoDTensor>();
|
||||
tensor->Resize(framework::make_ddim(Attr<std::vector<int64_t>>("shape")));
|
||||
} else if (out_var.IsType<framework::SelectedRows>()) {
|
||||
tensor = out_var.GetMutable<framework::SelectedRows>()->mutable_value();
|
||||
tensor->Resize(framework::make_ddim(Attr<std::vector<int64_t>>("shape")));
|
||||
} else {
|
||||
PADDLE_THROW(
|
||||
"fake init op's output only"
|
||||
"supports SelectedRows and LoDTensor");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
class FakeInitOpVarTypeInference : public framework::VarTypeInference {
|
||||
public:
|
||||
void operator()(const framework::OpDesc &op_desc,
|
||||
framework::BlockDesc *block) const override {}
|
||||
};
|
||||
|
||||
class FakeInitOpMaker : public framework::OpProtoAndCheckerMaker {
|
||||
public:
|
||||
void Make() override {
|
||||
AddAttr<std::vector<int64_t>>("shape",
|
||||
"(vector<int64_t>) The shape of the output");
|
||||
AddOutput("Out",
|
||||
"(Tensor) Tensor of specified shape will be filled "
|
||||
"with the specified value");
|
||||
AddComment(R"DOC(
|
||||
FakeInit Operator.
|
||||
|
||||
Init an variable but not alloc memory for it, it is used for init the
|
||||
table parameter at trainer side in distributed lookup table.
|
||||
|
||||
)DOC");
|
||||
}
|
||||
};
|
||||
} // namespace operators
|
||||
} // namespace paddle
|
||||
|
||||
namespace ops = paddle::operators;
|
||||
REGISTER_OPERATOR(fake_init, ops::FakeInitOp, ops::FakeInitInferShape,
|
||||
ops::FakeInitOpMaker, paddle::framework::EmptyGradOpMaker,
|
||||
ops::FakeInitOpVarTypeInference);
|
||||
@ -0,0 +1,52 @@
|
||||
# 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 __future__ import print_function
|
||||
|
||||
import unittest
|
||||
|
||||
import paddle.fluid.core as core
|
||||
from paddle.fluid.op import Operator
|
||||
|
||||
|
||||
class TestFakeInitOpSelectedRows(unittest.TestCase):
|
||||
def check_with_place(self, place, is_selected_rows):
|
||||
scope = core.Scope()
|
||||
|
||||
out_var_name = 'Out'
|
||||
if is_selected_rows:
|
||||
out_tensor = scope.var(out_var_name).get_selected_rows().get_tensor(
|
||||
)
|
||||
else:
|
||||
out_tensor = scope.var(out_var_name).get_tensor()
|
||||
|
||||
var_shape = [4, 784]
|
||||
|
||||
# create and run fake_init_op
|
||||
fake_init_op = Operator("fake_init", Out=out_var_name, shape=var_shape)
|
||||
fake_init_op.run(scope, place)
|
||||
|
||||
self.assertEqual(var_shape, out_tensor._get_dims())
|
||||
|
||||
def test_fake_init_selected_rows(self):
|
||||
places = [core.CPUPlace()]
|
||||
if core.is_compiled_with_cuda():
|
||||
places.append(core.CUDAPlace(0))
|
||||
for place in places:
|
||||
for is_selected_rows in [True, False]:
|
||||
self.check_with_place(place, is_selected_rows)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Loading…
Reference in new issue