Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into dev_reverse_op
fengjiayi
7 years ago
commit
ea73fb8416
@ -0,0 +1,76 @@
|
||||
// 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/scope_buffered_ssa_graph_executor.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "paddle/fluid/framework/executor.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace details {
|
||||
ScopeBufferedSSAGraphExecutor::ScopeBufferedSSAGraphExecutor(
|
||||
ExecutionStrategy strategy, std::vector<Scope *> local_scopes,
|
||||
std::vector<VariableInfo> var_infos, std::vector<platform::Place> places,
|
||||
std::unique_ptr<SSAGraphExecutor> &&underlying_executor)
|
||||
: strategy_(std::move(strategy)),
|
||||
underlying_executor_(std::move(underlying_executor)),
|
||||
local_scopes_(std::move(local_scopes)),
|
||||
var_infos_(std::move(var_infos)),
|
||||
places_(std::move(places)) {}
|
||||
|
||||
FeedFetchList ScopeBufferedSSAGraphExecutor::Run(
|
||||
const std::vector<std::string> &fetch_tensors) {
|
||||
if (drop_scope_counter_ == 0) {
|
||||
// Create local scopes.
|
||||
for (auto it = local_scopes_.rbegin(); it != local_scopes_.rend(); ++it) {
|
||||
auto &scope = *it;
|
||||
Scope &local_scope = scope->NewScope();
|
||||
*scope->Var(details::kLocalExecScopeName)->GetMutable<Scope *>() =
|
||||
&local_scope;
|
||||
|
||||
for (auto &info : var_infos_) {
|
||||
if (scope->FindVar(info.name_) != nullptr) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (info.persistable_) { // Persistable
|
||||
InitializeVariable(scope->Var(info.name_), info.type_);
|
||||
} else {
|
||||
InitializeVariable(local_scope.Var(info.name_), info.type_);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
auto fetch_data = underlying_executor_->Run(fetch_tensors);
|
||||
drop_scope_counter_ += 1;
|
||||
if (!fetch_tensors.empty() ||
|
||||
drop_scope_counter_ == strategy_.num_iteration_per_drop_scope_) {
|
||||
drop_scope_counter_ = 0;
|
||||
// Wait All computational streams
|
||||
for (auto p : places_) {
|
||||
platform::DeviceContextPool::Instance().Get(p)->Wait();
|
||||
}
|
||||
for (auto &scope : local_scopes_) {
|
||||
auto &local_scope =
|
||||
*scope->Var(details::kLocalExecScopeName)->GetMutable<Scope *>();
|
||||
scope->DeleteScope(local_scope);
|
||||
}
|
||||
}
|
||||
return fetch_data;
|
||||
}
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,53 @@
|
||||
// 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/execution_strategy.h"
|
||||
#include "paddle/fluid/framework/details/ssa_graph_executor.h"
|
||||
#include "paddle/fluid/framework/scope.h"
|
||||
#include "paddle/fluid/platform/place.h"
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace details {
|
||||
|
||||
struct VariableInfo {
|
||||
std::string name_;
|
||||
proto::VarType::Type type_;
|
||||
bool persistable_;
|
||||
};
|
||||
|
||||
class ScopeBufferedSSAGraphExecutor : public SSAGraphExecutor {
|
||||
public:
|
||||
ScopeBufferedSSAGraphExecutor(
|
||||
ExecutionStrategy strategy, std::vector<Scope*> local_scopes,
|
||||
std::vector<VariableInfo> var_infos, std::vector<platform::Place> places,
|
||||
std::unique_ptr<SSAGraphExecutor>&& underlying_executor);
|
||||
FeedFetchList Run(const std::vector<std::string>& fetch_tensors) override;
|
||||
|
||||
private:
|
||||
size_t drop_scope_counter_{0};
|
||||
|
||||
ExecutionStrategy strategy_;
|
||||
std::unique_ptr<SSAGraphExecutor> underlying_executor_;
|
||||
std::vector<Scope*> local_scopes_;
|
||||
std::vector<VariableInfo> var_infos_;
|
||||
std::vector<platform::Place> places_;
|
||||
};
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,68 @@
|
||||
/* 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. */
|
||||
|
||||
/*
|
||||
* This file create an DFG_GraphvizDrawPass which helps to draw a data flow
|
||||
* graph's structure using graphviz.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
#include "paddle/fluid/inference/analysis/pass.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace inference {
|
||||
namespace analysis {
|
||||
|
||||
/*
|
||||
* Output a dot file and write to some place.
|
||||
*/
|
||||
class DFG_GraphvizDrawPass : public DataFlowGraphPass {
|
||||
public:
|
||||
DFG_GraphvizDrawPass(const std::string& dir, const std::string& id)
|
||||
: dir_(dir), id_(id) {}
|
||||
|
||||
bool Initialize() override { return Pass::Initialize(); }
|
||||
void Run(DataFlowGraph* graph) override {
|
||||
auto content = Draw(graph);
|
||||
std::ofstream file(GenDotPath());
|
||||
file.write(content.c_str(), content.size());
|
||||
file.close();
|
||||
LOG(INFO) << "draw dot to " << GenDotPath();
|
||||
}
|
||||
|
||||
bool Finalize() override { return Pass::Finalize(); }
|
||||
|
||||
Pass* CreatePrinterPass(std::ostream& os,
|
||||
const std::string& banner) const override {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
private:
|
||||
// Path of the dot file to output.
|
||||
std::string GenDotPath() const {
|
||||
return dir_ + "/" + "graph_" + id_ + ".dot";
|
||||
}
|
||||
|
||||
std::string Draw(DataFlowGraph* graph) { return graph->DotString(); }
|
||||
|
||||
std::string dir_;
|
||||
std::string id_;
|
||||
};
|
||||
|
||||
} // namespace analysis
|
||||
} // namespace inference
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,46 @@
|
||||
/* 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/inference/analysis/dfg_graphviz_draw_pass.h"
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
#include "paddle/fluid/inference/analysis/ut_helper.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace inference {
|
||||
namespace analysis {
|
||||
|
||||
TEST_F(DFG_Tester, dfg_graphviz_draw_pass_tester) {
|
||||
auto dfg = ProgramDescToDFG(desc);
|
||||
DFG_GraphvizDrawPass pass("./", "test");
|
||||
pass.Initialize();
|
||||
pass.Run(&dfg);
|
||||
|
||||
// test content
|
||||
std::ifstream file("./graph_test.dot");
|
||||
ASSERT_TRUE(file.is_open());
|
||||
|
||||
std::string line;
|
||||
int no{0};
|
||||
while (std::getline(file, line)) {
|
||||
no++;
|
||||
}
|
||||
ASSERT_EQ(no, 82);
|
||||
}
|
||||
|
||||
} // namespace analysis
|
||||
} // namespace inference
|
||||
} // namespace paddle
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue