Reader sequential and inference partial feed (#22699)
* sequential reader stage 1, test=develop * fix ut, test=develop * fix iterable=False reset bug, add some logs and polish code, test=develop * inference feed partial data, test=develop * Turn on keep_order=True for test, test=develop * enhance ut to test more cases, test=develop * test commit for reverting * Revert "test commit for reverting", test=develop This reverts commit 80aef42ef52ba1ee79627d6f663a624ec4f12f58. * add ut of merged and unmerged results, test=develop * add more uts for coverages and add en doc of api, test=develop * follow comments, test=develop * change note style, test=developrevert-23830-2.0-beta
Zeng Jinle
5 years ago
committed by
GitHub
parent
95b356a069
commit
acfc9b8a70
@ -0,0 +1,101 @@
|
||||
// Copyright (c) 2020 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/details/computation_op_handle.h"
|
||||
#include "paddle/fluid/framework/details/multi_devices_helper.h"
|
||||
#include "paddle/fluid/framework/ir/graph.h"
|
||||
#include "paddle/fluid/framework/ir/pass.h"
|
||||
#include "paddle/fluid/operators/reader/lod_tensor_blocking_queue.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace ir {
|
||||
|
||||
static int GetDeviceCountFromPassAttr(const Pass &pass) {
|
||||
return static_cast<int>(
|
||||
pass.Get<const std::vector<platform::Place>>(details::kPlaces).size());
|
||||
}
|
||||
|
||||
static std::unordered_set<std::string> ReaderOpSet() {
|
||||
return {"create_py_reader"};
|
||||
}
|
||||
|
||||
class InitReaderDeviceCountPass : public Pass {
|
||||
protected:
|
||||
void ApplyImpl(Graph *graph) const override {
|
||||
using QueueHolder =
|
||||
operators::reader::OrderedMultiDeviceLoDTensorBlockingQueueHolder;
|
||||
|
||||
auto reader_ops = ReaderOpSet();
|
||||
auto dev_cnt = GetDeviceCountFromPassAttr(*this);
|
||||
const auto &scope = Get<const Scope>(details::kGlobalScope);
|
||||
for (auto &node : graph->Nodes()) {
|
||||
if (node->IsOp() && node->Op() &&
|
||||
reader_ops.count(node->Op()->Type()) != 0) {
|
||||
auto queue_name = node->Op()->Input("blocking_queue")[0];
|
||||
auto var = scope.FindVar(queue_name);
|
||||
if (var && var->IsType<QueueHolder>()) {
|
||||
VLOG(10) << "Set device count of " << queue_name << " to be "
|
||||
<< dev_cnt;
|
||||
var->GetMutable<QueueHolder>()->GetQueue()->SetDeviceCount(dev_cnt);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
class SetReaderDeviceIndexPass : public Pass {
|
||||
protected:
|
||||
void ApplyImpl(Graph *graph) const override {
|
||||
auto dev_cnt = GetDeviceCountFromPassAttr(*this);
|
||||
auto reader_ops = ReaderOpSet();
|
||||
size_t found_op_num = 0;
|
||||
|
||||
for (auto &node : graph->Nodes()) {
|
||||
if (node->IsOp() && node->Op() &&
|
||||
reader_ops.count(node->Op()->Type()) != 0) {
|
||||
auto &op_handle = dynamic_cast<details::ComputationOpHandle &>(
|
||||
node->Wrapper<details::OpHandleBase>());
|
||||
auto *op_desc = node->Op();
|
||||
auto &op_base_attrs =
|
||||
const_cast<framework::AttributeMap &>(op_handle.GetOp()->Attrs());
|
||||
int dev_idx = static_cast<int>(op_handle.GetScopeIdx());
|
||||
|
||||
op_desc->SetAttr("device_index", dev_idx);
|
||||
op_desc->SetAttr("device_count", dev_cnt);
|
||||
|
||||
op_base_attrs["device_index"] = dev_idx;
|
||||
op_base_attrs["device_count"] = dev_cnt;
|
||||
|
||||
++found_op_num;
|
||||
VLOG(10) << "Found op " << op_desc->Type() << " on device " << dev_idx;
|
||||
}
|
||||
}
|
||||
|
||||
VLOG(10) << "Found op number " << found_op_num;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace ir
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
|
||||
REGISTER_PASS(init_reader_device_count_pass,
|
||||
paddle::framework::ir::InitReaderDeviceCountPass)
|
||||
.RequirePassAttr(paddle::framework::details::kGlobalScope)
|
||||
.RequirePassAttr(paddle::framework::details::kPlaces);
|
||||
|
||||
REGISTER_PASS(set_reader_device_index_pass,
|
||||
paddle::framework::ir::SetReaderDeviceIndexPass)
|
||||
.RequirePassAttr(paddle::framework::details::kPlaces);
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue