Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into feature/python_doc
yuyang18
7 years ago
commit
59d75bda74
@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
PADDLE_TRAINING_ROLE=PSERVER PADDLE_PSERVER_PORT=7164 PADDLE_PSERVER_IPS=127.0.0.1 PADDLE_TRAINERS=2 PADDLE_CURRENT_IP=127.0.0.1 PADDLE_TRAINER_ID=0 python fluid_benchmark.py --model resnet --device CPU --update_method pserver --iterations=10000 &
|
||||||
|
|
||||||
|
sleep 15
|
||||||
|
|
||||||
|
CUDA_VISIBLE_DEVICES=0,1 PADDLE_TRAINING_ROLE=TRAINER PADDLE_PSERVER_PORT=7164 PADDLE_PSERVER_IPS=127.0.0.1 PADDLE_TRAINERS=2 PADDLE_CURRENT_IP=127.0.0.1 PADDLE_TRAINER_ID=0 python fluid_benchmark.py --model resnet --device GPU --update_method pserver --iterations=10000 --gpus 2 &
|
||||||
|
|
||||||
|
CUDA_VISIBLE_DEVICES=2,3 PADDLE_TRAINING_ROLE=TRAINER PADDLE_PSERVER_PORT=7164 PADDLE_PSERVER_IPS=127.0.0.1 PADDLE_TRAINERS=2 PADDLE_CURRENT_IP=127.0.0.1 PADDLE_TRAINER_ID=1 python fluid_benchmark.py --model resnet --device GPU --update_method pserver --iterations=10000 --gpus 2 &
|
||||||
@ -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.
|
||||||
|
|
||||||
|
#include "paddle/fluid/framework/details/graph_builder_factory.h"
|
||||||
|
#include <fstream>
|
||||||
|
#include "paddle/fluid/framework/details/multi_devices_graph_builder.h"
|
||||||
|
#include "paddle/fluid/framework/details/ssa_graph_printer.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace details {
|
||||||
|
std::unique_ptr<SSAGraphBuilder> SSAGraphBuilderFactory::Create() {
|
||||||
|
std::unique_ptr<SSAGraphBuilder> res(
|
||||||
|
#ifdef PADDLE_WITH_CUDA
|
||||||
|
new MultiDevSSAGraphBuilder(places_, loss_var_name_, param_names_,
|
||||||
|
local_scopes_, nccl_ctxs_, strategy_)
|
||||||
|
#else
|
||||||
|
new MultiDevSSAGraphBuilder(places_, loss_var_name_, param_names_,
|
||||||
|
local_scopes_, strategy_)
|
||||||
|
#endif
|
||||||
|
); // NOLINT
|
||||||
|
|
||||||
|
if (!strategy_.debug_graphviz_path_.empty()) {
|
||||||
|
std::unique_ptr<std::ostream> fout(
|
||||||
|
new std::ofstream(strategy_.debug_graphviz_path_));
|
||||||
|
PADDLE_ENFORCE(fout->good());
|
||||||
|
std::unique_ptr<GraphvizSSAGraphPrinter> graphviz_printer(
|
||||||
|
new GraphvizSSAGraphPrinter());
|
||||||
|
res.reset(new SSAGraghBuilderWithPrinter(
|
||||||
|
std::move(fout), std::move(graphviz_printer), std::move(res)));
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
} // namespace details
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,67 @@
|
|||||||
|
// 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/build_strategy.h"
|
||||||
|
#include "paddle/fluid/framework/details/ssa_graph_builder.h"
|
||||||
|
#include "paddle/fluid/platform/place.h"
|
||||||
|
|
||||||
|
#ifdef PADDLE_WITH_CUDA
|
||||||
|
#include "paddle/fluid/platform/nccl_helper.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
class Scope;
|
||||||
|
namespace details {
|
||||||
|
|
||||||
|
class SSAGraphBuilderFactory {
|
||||||
|
public:
|
||||||
|
SSAGraphBuilderFactory(const std::vector<platform::Place>& places,
|
||||||
|
const std::string& loss_var_name,
|
||||||
|
const std::unordered_set<std::string>& param_names,
|
||||||
|
const std::vector<Scope*>& local_scopes,
|
||||||
|
const BuildStrategy& strategy)
|
||||||
|
: places_(places),
|
||||||
|
loss_var_name_(loss_var_name),
|
||||||
|
param_names_(param_names),
|
||||||
|
local_scopes_(local_scopes),
|
||||||
|
strategy_(strategy) {}
|
||||||
|
|
||||||
|
#ifdef PADDLE_WITH_CUDA
|
||||||
|
void SetNCCLContextMap(platform::NCCLContextMap* nccl_ctxs) {
|
||||||
|
nccl_ctxs_ = nccl_ctxs;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::unique_ptr<SSAGraphBuilder> Create();
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::vector<platform::Place> places_;
|
||||||
|
std::string loss_var_name_;
|
||||||
|
std::unordered_set<std::string> param_names_;
|
||||||
|
std::vector<Scope*> local_scopes_;
|
||||||
|
BuildStrategy strategy_;
|
||||||
|
|
||||||
|
#ifdef PADDLE_WITH_CUDA
|
||||||
|
platform::NCCLContextMap* nccl_ctxs_;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace details
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,83 @@
|
|||||||
|
// 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/ssa_graph_printer.h"
|
||||||
|
#include <string>
|
||||||
|
#include "paddle/fluid/framework/details/ssa_graph.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace details {
|
||||||
|
|
||||||
|
template <typename Callback>
|
||||||
|
static inline void IterAllVar(const SSAGraph &graph, Callback callback) {
|
||||||
|
for (auto &each : graph.vars_) {
|
||||||
|
for (auto &pair1 : each) {
|
||||||
|
for (auto &pair2 : pair1.second) {
|
||||||
|
callback(*pair2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto &var : graph.dep_vars_) {
|
||||||
|
callback(*var);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void GraphvizSSAGraphPrinter::Print(const SSAGraph &graph,
|
||||||
|
std::ostream &sout) const {
|
||||||
|
size_t var_id = 0;
|
||||||
|
std::unordered_map<const VarHandleBase *, size_t> vars;
|
||||||
|
|
||||||
|
sout << "digraph G {\n";
|
||||||
|
|
||||||
|
IterAllVar(graph, [&](const VarHandleBase &var) {
|
||||||
|
auto *var_ptr = &var;
|
||||||
|
auto *var_handle_ptr = dynamic_cast<const VarHandle *>(var_ptr);
|
||||||
|
auto *dummy_ptr = dynamic_cast<const DummyVarHandle *>(var_ptr);
|
||||||
|
|
||||||
|
size_t cur_var_id = var_id++;
|
||||||
|
vars[var_ptr] = cur_var_id;
|
||||||
|
|
||||||
|
if (var_handle_ptr) {
|
||||||
|
sout << "var_" << cur_var_id << " [label=\"" << var_handle_ptr->name_
|
||||||
|
<< "\\n"
|
||||||
|
<< var_handle_ptr->place_ << "\\n"
|
||||||
|
<< var_handle_ptr->version_ << "\"]" << std::endl;
|
||||||
|
} else if (dummy_ptr) {
|
||||||
|
sout << "var_" << cur_var_id << " [label=\"dummy\"]" << std::endl;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
size_t op_id = 0;
|
||||||
|
for (auto &op : graph.ops_) {
|
||||||
|
std::string op_name = "op_" + std::to_string(op_id++);
|
||||||
|
sout << op_name << " [label=\"" << op->Name() << "\", shape=rect]"
|
||||||
|
<< std::endl;
|
||||||
|
for (auto in : op->Inputs()) {
|
||||||
|
std::string var_name = "var_" + std::to_string(vars[in]);
|
||||||
|
sout << var_name << " -> " << op_name << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto out : op->Outputs()) {
|
||||||
|
std::string var_name = "var_" + std::to_string(vars[out]);
|
||||||
|
sout << op_name << " -> " << var_name << std::endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sout << "}\n";
|
||||||
|
}
|
||||||
|
} // namespace details
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,67 @@
|
|||||||
|
// 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 <iosfwd>
|
||||||
|
#include "paddle/fluid/framework/details/ssa_graph_builder.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace details {
|
||||||
|
class SSAGraph;
|
||||||
|
class SSAGraphPrinter {
|
||||||
|
public:
|
||||||
|
virtual ~SSAGraphPrinter() {}
|
||||||
|
virtual void Print(const SSAGraph& graph, std::ostream& sout) const = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
class GraphvizSSAGraphPrinter : public SSAGraphPrinter {
|
||||||
|
public:
|
||||||
|
void Print(const SSAGraph& graph, std::ostream& sout) const override;
|
||||||
|
};
|
||||||
|
|
||||||
|
class SSAGraghBuilderWithPrinter : public SSAGraphBuilder {
|
||||||
|
public:
|
||||||
|
SSAGraghBuilderWithPrinter(std::ostream& sout,
|
||||||
|
std::unique_ptr<SSAGraphPrinter>&& printer,
|
||||||
|
std::unique_ptr<SSAGraphBuilder>&& builder)
|
||||||
|
: printer_(std::move(printer)),
|
||||||
|
builder_(std::move(builder)),
|
||||||
|
stream_ref_(sout) {}
|
||||||
|
|
||||||
|
SSAGraghBuilderWithPrinter(std::unique_ptr<std::ostream>&& sout,
|
||||||
|
std::unique_ptr<SSAGraphPrinter>&& printer,
|
||||||
|
std::unique_ptr<SSAGraphBuilder>&& builder)
|
||||||
|
: printer_(std::move(printer)),
|
||||||
|
builder_(std::move(builder)),
|
||||||
|
stream_ptr_(std::move(sout)),
|
||||||
|
stream_ref_(*stream_ptr_) {}
|
||||||
|
|
||||||
|
std::unique_ptr<SSAGraph> Build(const ProgramDesc& program) const override {
|
||||||
|
auto graph = builder_->Build(program);
|
||||||
|
printer_->Print(*graph, stream_ref_);
|
||||||
|
return graph;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::unique_ptr<SSAGraphPrinter> printer_;
|
||||||
|
std::unique_ptr<SSAGraphBuilder> builder_;
|
||||||
|
std::unique_ptr<std::ostream> stream_ptr_;
|
||||||
|
std::ostream& stream_ref_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // 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