Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into refactor-prefetch
test=developf7c96f079b
Qiao Longfei
6 years ago
commit
145c535750
@ -0,0 +1,47 @@
|
|||||||
|
# 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.
|
||||||
|
#
|
||||||
|
|
||||||
|
IF(MOBILE_INFERENCE)
|
||||||
|
return()
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
include (ExternalProject)
|
||||||
|
|
||||||
|
# NOTE: gzstream is needed when linking with ctr reader.
|
||||||
|
|
||||||
|
SET(GZSTREAM_SOURCES_DIR ${THIRD_PARTY_PATH}/gzstream)
|
||||||
|
SET(GZSTREAM_INSTALL_DIR ${THIRD_PARTY_PATH}/install/gzstream)
|
||||||
|
SET(GZSTREAM_INCLUDE_DIR "${GZSTREAM_INSTALL_DIR}/include/" CACHE PATH "gzstream include directory." FORCE)
|
||||||
|
|
||||||
|
ExternalProject_Add(
|
||||||
|
extern_gzstream
|
||||||
|
GIT_REPOSITORY "https://github.com/jacquesqiao/gzstream.git"
|
||||||
|
GIT_TAG ""
|
||||||
|
PREFIX ${GZSTREAM_SOURCES_DIR}
|
||||||
|
UPDATE_COMMAND ""
|
||||||
|
CONFIGURE_COMMAND ""
|
||||||
|
BUILD_IN_SOURCE 1
|
||||||
|
BUILD_COMMAND make -j8
|
||||||
|
INSTALL_COMMAND mkdir -p ${GZSTREAM_INSTALL_DIR}/lib/ && mkdir -p ${GZSTREAM_INSTALL_DIR}/include/
|
||||||
|
&& cp ${GZSTREAM_SOURCES_DIR}/src/extern_gzstream/libgzstream.a ${GZSTREAM_INSTALL_DIR}/lib
|
||||||
|
&& cp -r ${GZSTREAM_SOURCES_DIR}/src/extern_gzstream/gzstream.h ${GZSTREAM_INSTALL_DIR}/include
|
||||||
|
)
|
||||||
|
|
||||||
|
ADD_LIBRARY(gzstream STATIC IMPORTED GLOBAL)
|
||||||
|
SET_PROPERTY(TARGET gzstream PROPERTY IMPORTED_LOCATION
|
||||||
|
"${GZSTREAM_INSTALL_DIR}/lib/libgzstream.a")
|
||||||
|
|
||||||
|
include_directories(${GZSTREAM_INCLUDE_DIR})
|
||||||
|
ADD_DEPENDENCIES(gzstream extern_gzstream zlib)
|
||||||
@ -0,0 +1,125 @@
|
|||||||
|
// 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 <algorithm>
|
||||||
|
#include <string>
|
||||||
|
#include <unordered_map>
|
||||||
|
#include <unordered_set>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "paddle/fluid/framework/details/all_reduce_deps_pass.h"
|
||||||
|
#include "paddle/fluid/framework/details/all_reduce_op_handle.h"
|
||||||
|
#include "paddle/fluid/framework/details/multi_devices_helper.h"
|
||||||
|
#include "paddle/fluid/framework/details/op_graph_view.h"
|
||||||
|
#include "paddle/fluid/framework/details/var_handle.h"
|
||||||
|
#include "paddle/fluid/framework/ir/graph_helper.h"
|
||||||
|
#include "paddle/fluid/framework/op_proto_maker.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace details {
|
||||||
|
|
||||||
|
static constexpr char kAllOpDescs[] = "all_op_descs";
|
||||||
|
|
||||||
|
VarHandle* GetValidInput(const OpHandleBase* a) {
|
||||||
|
for (auto p : a->Inputs()) {
|
||||||
|
VarHandle* b = dynamic_cast<VarHandle*>(p);
|
||||||
|
if (b) {
|
||||||
|
return b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<ir::Graph> AllReduceDepsPass::ApplyImpl(
|
||||||
|
std::unique_ptr<ir::Graph> graph) const {
|
||||||
|
auto graph_ops = ir::FilterByNodeWrapper<OpHandleBase>(*graph);
|
||||||
|
|
||||||
|
// get vars order
|
||||||
|
int order = 0;
|
||||||
|
std::unordered_map<std::string, int> vars;
|
||||||
|
// TODO(gongwb): use graph topology sort to find the order of operators.
|
||||||
|
// Note that must assert topology sort is stable
|
||||||
|
auto& ops = Get<const std::vector<OpDesc*>>(kAllOpDescs);
|
||||||
|
for (auto* op_desc : ops) {
|
||||||
|
auto outputs = op_desc->Outputs();
|
||||||
|
for (auto& o_it : outputs) {
|
||||||
|
for (auto& v : o_it.second) { // values
|
||||||
|
vars[v] = order;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
order++;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<OpHandleBase*> dist_ops;
|
||||||
|
// get allreduce ops.
|
||||||
|
for (auto& op : graph_ops) {
|
||||||
|
// FIXME(gongwb):add broad cast.
|
||||||
|
if (op->Name() == "all_reduce" || op->Name() == "reduce") {
|
||||||
|
dist_ops.push_back(op);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
VLOG(10) << "dist_ops size:" << dist_ops.size() << std::endl;
|
||||||
|
|
||||||
|
std::sort(dist_ops.begin(), dist_ops.end(), [&](OpHandleBase* op1,
|
||||||
|
OpHandleBase* op2) {
|
||||||
|
VarHandle* i0 = dynamic_cast<VarHandle*>(GetValidInput(op1));
|
||||||
|
VarHandle* i1 = dynamic_cast<VarHandle*>(GetValidInput(op2));
|
||||||
|
|
||||||
|
PADDLE_ENFORCE(i0 != nullptr && i1 != nullptr, "%s convert to %s error",
|
||||||
|
op1->DebugString(), op2->DebugString());
|
||||||
|
|
||||||
|
auto l_it = vars.find(i0->name_);
|
||||||
|
auto r_it = vars.find(i1->name_);
|
||||||
|
|
||||||
|
if (l_it->second < r_it->second) return true;
|
||||||
|
|
||||||
|
if (l_it->second == r_it->second) {
|
||||||
|
return i0->name_ < i1->name_;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
|
// add dependency.
|
||||||
|
auto& sorted_ops = dist_ops;
|
||||||
|
for (size_t i = 1; i < sorted_ops.size(); ++i) {
|
||||||
|
auto* dep_var = new DummyVarHandle(graph->CreateControlDepVar());
|
||||||
|
|
||||||
|
auto* pre_op = sorted_ops[i - 1];
|
||||||
|
auto* op = sorted_ops[i];
|
||||||
|
|
||||||
|
pre_op->AddOutput(dep_var);
|
||||||
|
op->AddInput(dep_var);
|
||||||
|
graph->Get<GraphDepVars>(kGraphDepVars).emplace(dep_var);
|
||||||
|
|
||||||
|
VLOG(10) << "add all_reduce sequential dependencies between " << pre_op
|
||||||
|
<< " and " << op;
|
||||||
|
|
||||||
|
VLOG(10) << "pre_op:" << pre_op->DebugString()
|
||||||
|
<< ", op:" << op->DebugString();
|
||||||
|
}
|
||||||
|
|
||||||
|
return graph;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace details
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
|
|
||||||
|
REGISTER_PASS(all_reduce_deps_pass,
|
||||||
|
paddle::framework::details::AllReduceDepsPass)
|
||||||
|
.RequirePassAttr(paddle::framework::details::kAllOpDescs);
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
// 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 "paddle/fluid/framework/ir/graph.h"
|
||||||
|
#include "paddle/fluid/framework/ir/pass.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace details {
|
||||||
|
|
||||||
|
// TODO(gongwb): overlap allreduce with backward computation.
|
||||||
|
class AllReduceDepsPass : public ir::Pass {
|
||||||
|
protected:
|
||||||
|
std::unique_ptr<ir::Graph> ApplyImpl(
|
||||||
|
std::unique_ptr<ir::Graph> graph) const override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace details
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue