Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into port_python3_syntax
minqiyang
7 years ago
commit
000ba1ac5f
File diff suppressed because it is too large
Load Diff
@ -1,50 +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/framework/details/ssa_graph_builder_factory.h"
|
||||
#include <fstream>
|
||||
#include "paddle/fluid/framework/details/multi_devices_graph_builder.h"
|
||||
#include "paddle/fluid/framework/details/ssa_graph_checker.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)));
|
||||
}
|
||||
res.reset(new SSAGraghBuilderWithChecker(std::move(res)));
|
||||
|
||||
return res;
|
||||
}
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -1,71 +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.
|
||||
|
||||
#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
|
||||
nccl_ctxs_ = nullptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
#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
|
||||
@ -1,6 +1,9 @@
|
||||
cc_library(node SRCS node.cc DEPS proto_desc)
|
||||
cc_library(graph SRCS graph.cc DEPS node)
|
||||
cc_library(graph_helper SRCS graph_helper.cc DEPS graph)
|
||||
cc_library(pass SRCS pass.cc DEPS graph node)
|
||||
cc_test(graph_test SRCS graph_test.cc DEPS graph op_registry)
|
||||
cc_test(graph_helper_test SRCS graph_helper_test.cc DEPS graph_helper op_registry)
|
||||
cc_library(pass SRCS pass.cc DEPS graph node graph_helper)
|
||||
cc_library(graph_viz_pass SRCS graph_viz_pass.cc DEPS graph pass graph_helper)
|
||||
|
||||
cc_test(pass_test SRCS pass_test.cc DEPS graph pass graph_helper)
|
||||
cc_test(graph_test SRCS graph_test.cc DEPS graph graph_helper op_registry)
|
||||
cc_test(graph_helper_test SRCS graph_helper_test.cc DEPS graph graph_helper op_registry)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue