Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into feature/exception_safe_pe
yuyang18
7 years ago
commit
7d6afee5c1
@ -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.
|
||||
|
||||
#include "paddle/fluid/framework/reader.h"
|
||||
#include <memory>
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class StubDecoratedReader : public paddle::framework::DecoratedReader {
|
||||
public:
|
||||
explicit StubDecoratedReader(const std::shared_ptr<ReaderBase> &reader)
|
||||
: DecoratedReader(reader) {}
|
||||
|
||||
void ReadNextImpl(std::vector<paddle::framework::LoDTensor> *out) override {}
|
||||
};
|
||||
|
||||
class StubRootReader : public paddle::framework::ReaderBase {
|
||||
public:
|
||||
void ReadNextImpl(std::vector<paddle::framework::LoDTensor> *out) override {}
|
||||
};
|
||||
|
||||
TEST(READER, decorate_chain) {
|
||||
auto root = std::make_shared<StubRootReader>();
|
||||
auto end_point1 =
|
||||
paddle::framework::MakeDecoratedReader<StubDecoratedReader>(root);
|
||||
auto end_point2 =
|
||||
paddle::framework::MakeDecoratedReader<StubDecoratedReader>(root);
|
||||
|
||||
{
|
||||
auto endpoints = root->GetEndPoints();
|
||||
ASSERT_EQ(endpoints.size(), 2U);
|
||||
ASSERT_NE(endpoints.count(end_point1.get()), 0);
|
||||
ASSERT_NE(endpoints.count(end_point2.get()), 0);
|
||||
}
|
||||
|
||||
{
|
||||
auto end_point3 =
|
||||
paddle::framework::MakeDecoratedReader<StubDecoratedReader>(root);
|
||||
ASSERT_EQ(root->GetEndPoints().size(), 3U);
|
||||
}
|
||||
{ ASSERT_EQ(root->GetEndPoints().size(), 2U); }
|
||||
}
|
||||
@ -1,79 +0,0 @@
|
||||
// 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/operators/detail/safe_ref.h"
|
||||
#include "paddle/fluid/operators/reader/reader_op_registry.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace operators {
|
||||
namespace reader {
|
||||
|
||||
class ThreadedReader : public framework::DecoratedReader {
|
||||
public:
|
||||
explicit ThreadedReader(const std::shared_ptr<ReaderBase>& reader)
|
||||
: DecoratedReader(reader) {}
|
||||
|
||||
void ReadNext(std::vector<framework::LoDTensor>* out) override {
|
||||
std::lock_guard<std::mutex> lock(mutex_);
|
||||
reader_->ReadNext(out);
|
||||
}
|
||||
|
||||
void ReInit() override { reader_->ReInit(); }
|
||||
|
||||
private:
|
||||
std::mutex mutex_;
|
||||
};
|
||||
|
||||
class CreateThreadedReaderOp : public framework::OperatorBase {
|
||||
public:
|
||||
using framework::OperatorBase::OperatorBase;
|
||||
|
||||
private:
|
||||
void RunImpl(const framework::Scope& scope,
|
||||
const platform::Place& dev_place) const override {
|
||||
auto* out = detail::Ref(scope.FindVar(Output("Out")))
|
||||
.GetMutable<framework::ReaderHolder>();
|
||||
if (out->Get() != nullptr) {
|
||||
return;
|
||||
}
|
||||
const auto& underlying_reader = scope.FindVar(Input("UnderlyingReader"))
|
||||
->Get<framework::ReaderHolder>();
|
||||
out->Reset(new ThreadedReader(underlying_reader.Get()));
|
||||
}
|
||||
};
|
||||
|
||||
class CreateThreadedReaderOpMaker : public DecoratedReaderMakerBase {
|
||||
protected:
|
||||
void Apply() override {
|
||||
AddComment(R"DOC(
|
||||
CreateThreadedReader Operator
|
||||
|
||||
This operator creates a threaded reader. A threaded reader's
|
||||
'ReadNext()' can be invoked by several threads at the same
|
||||
time.
|
||||
When the attribute 'safe_mode' is true, the threaded reader's
|
||||
'ReInit()' is disabled to avoid unexpected bugs in multi-thread
|
||||
environment.
|
||||
)DOC");
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace reader
|
||||
} // namespace operators
|
||||
} // namespace paddle
|
||||
|
||||
namespace reader = paddle::operators::reader;
|
||||
REGISTER_DECORATED_READER_OPERATOR(create_threaded_reader,
|
||||
reader::CreateThreadedReaderOp,
|
||||
reader::CreateThreadedReaderOpMaker);
|
||||
Loading…
Reference in new issue