test fix fetch bar place for ce (#16406)
* test fix fetch bar place for ce * fix ps mode dist train in develop test=develop * fix style check test=develop * update test=developmove-code
Wu Yi
6 years ago
committed by
GitHub
parent
4f2278f032
commit
9ffd5eecef
@ -0,0 +1,66 @@
|
||||
// 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/details/fetch_barrier_op_handle.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace details {
|
||||
FetchBarrierOpHandle::FetchBarrierOpHandle(
|
||||
ir::Node *node, const std::vector<Scope *> &local_scopes,
|
||||
const std::vector<platform::Place> &places)
|
||||
// fetch_barrier op always run on place0, but output on all places.
|
||||
: OpHandleBase(node),
|
||||
op_(framework::OpRegistry::CreateOp(*node->Op())),
|
||||
local_scopes_(local_scopes),
|
||||
places_(places),
|
||||
run_scope_(local_scopes[0]),
|
||||
place_(places[0]) {
|
||||
for (auto &p : places) {
|
||||
this->SetDeviceContext(p, platform::DeviceContextPool::Instance().Get(p));
|
||||
}
|
||||
}
|
||||
|
||||
bool FetchBarrierOpHandle::IsMultiDeviceTransfer() {
|
||||
// override IsMultiDeviceTransfer to return true
|
||||
return true;
|
||||
}
|
||||
|
||||
void FetchBarrierOpHandle::RunImpl() {
|
||||
WaitInputVarGenerated(place_);
|
||||
|
||||
auto run_func = [this]() {
|
||||
op_->Run(*run_scope_->FindVar(kLocalExecScopeName)->Get<Scope *>(), place_);
|
||||
};
|
||||
|
||||
if (is_lock_and_record_event_free_) {
|
||||
run_func();
|
||||
} else {
|
||||
this->RunAndRecordEvent(run_func);
|
||||
}
|
||||
}
|
||||
|
||||
bool FetchBarrierOpHandle::NeedWait(VarHandleBase *in_var) {
|
||||
bool need_wait =
|
||||
in_var && in_var->GeneratedOp() &&
|
||||
in_var->GeneratedOp()->DeviceContext(place_) != dev_ctxes_.at(place_);
|
||||
return need_wait;
|
||||
}
|
||||
|
||||
std::string FetchBarrierOpHandle::Name() const { return op_->Type(); }
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,61 @@
|
||||
// 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.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "paddle/fluid/framework/details/op_handle_base.h"
|
||||
#include "paddle/fluid/framework/feed_fetch_type.h"
|
||||
#include "paddle/fluid/framework/op_registry.h"
|
||||
#include "paddle/fluid/framework/scope.h"
|
||||
#include "paddle/fluid/platform/device_context.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace details {
|
||||
|
||||
// **NOTE**: fetch_barrier op is special it outputs all recved variables on
|
||||
// all places if there are multiple places, must init with
|
||||
// multiple dev_ctxes_ !!!!
|
||||
|
||||
struct FetchBarrierOpHandle : public OpHandleBase {
|
||||
public:
|
||||
FetchBarrierOpHandle(ir::Node *node, const std::vector<Scope *> &local_scopes,
|
||||
const std::vector<platform::Place> &places);
|
||||
|
||||
bool IsMultiDeviceTransfer() override;
|
||||
|
||||
std::string Name() const override;
|
||||
|
||||
protected:
|
||||
void RunImpl() override;
|
||||
|
||||
bool NeedWait(VarHandleBase *in_var) override;
|
||||
|
||||
private:
|
||||
std::unique_ptr<OperatorBase> op_;
|
||||
std::vector<Scope *> local_scopes_;
|
||||
std::vector<platform::Place> places_;
|
||||
Scope *run_scope_;
|
||||
platform::Place place_;
|
||||
|
||||
bool is_lock_and_record_event_free_{false};
|
||||
};
|
||||
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
Loading…
Reference in new issue