提交 7d138593 编写于 作者: Q qiaolongfei

refine code of scope with style check

上级 fa4f00d9
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace paddle { namespace paddle {
namespace framework { namespace framework {
Error Scope::CreateVariable(const std::string &name) { Error Scope::CreateVariable(const std::string& name) {
if (name == "") { if (name == "") {
return Error("Variable name should not be empty"); return Error("Variable name should not be empty");
} }
...@@ -22,7 +22,7 @@ Variable* Scope::GetVarLocally(const std::string& name) const { ...@@ -22,7 +22,7 @@ Variable* Scope::GetVarLocally(const std::string& name) const {
return nullptr; return nullptr;
} }
Variable* Scope::GetVariable(const std::string &name) const { Variable* Scope::GetVariable(const std::string& name) const {
Variable* var = GetVarLocally(name); Variable* var = GetVarLocally(name);
if (var != nullptr) { if (var != nullptr) {
return var; return var;
...@@ -33,7 +33,7 @@ Variable* Scope::GetVariable(const std::string &name) const { ...@@ -33,7 +33,7 @@ Variable* Scope::GetVariable(const std::string &name) const {
} }
} }
Variable* Scope::GetOrCreateVariable(const std::string &name) { Variable* Scope::GetOrCreateVariable(const std::string& name) {
Variable* var = GetVariable(name); Variable* var = GetVariable(name);
if (var != nullptr) { if (var != nullptr) {
return var; return var;
...@@ -47,10 +47,9 @@ Variable* Scope::GetOrCreateVariable(const std::string &name) { ...@@ -47,10 +47,9 @@ Variable* Scope::GetOrCreateVariable(const std::string &name) {
} }
} }
bool Scope::HaveVariable(const std::string &name) { bool Scope::HaveVariable(const std::string& name) {
return vars_.count(name) != 0; return vars_.count(name) != 0;
} }
} // namespace framework } // namespace framework
} // namespace paddle } // namespace paddle
#pragma once #pragma once
#include <vector>
#include <unordered_map> #include <unordered_map>
#include <vector>
#include "paddle/framework/variable.h" #include "paddle/framework/variable.h"
#include "paddle/utils/Error.h" #include "paddle/utils/Error.h"
...@@ -11,16 +11,16 @@ namespace framework { ...@@ -11,16 +11,16 @@ namespace framework {
const static Error AlreadyCreated("Variable has already been created"); const static Error AlreadyCreated("Variable has already been created");
/** /**
* Scope is an association of a name to Variable. All variables belong to `Scope`. * Scope is an association of a name to Variable. All variables belong to
* You need to specify a scope to run a Net, i.e., `net.Run(&scope)`. One net can * `Scope`. You need to specify a scope to run a Net, i.e., `net.Run(&scope)`.
* run in different scopes and update different variable in the scope. * One net can run in different scopes and update different variable in the
* scope.
*/ */
class Scope { class Scope {
public: public:
Scope() {} Scope() {}
explicit Scope(const std::shared_ptr<Scope> &scope): explicit Scope(const std::shared_ptr<Scope>& scope) : parent_(scope) {}
parent_(scope) {}
~Scope() {} ~Scope() {}
...@@ -29,8 +29,7 @@ class Scope { ...@@ -29,8 +29,7 @@ class Scope {
Error __must_check CreateVariable(const std::string& name); Error __must_check CreateVariable(const std::string& name);
// Get Variable from this Scope, this function will recursive find Variable // Get Variable from this Scope, this function will recursive find Variable
// from it's parent scope. // from it's parent scope. Return nullptr if not found.
// Return nullptr if not found.
Variable* GetVariable(const std::string& name) const; Variable* GetVariable(const std::string& name) const;
// find and return Variables in the scope it self. // find and return Variables in the scope it self.
...@@ -44,7 +43,7 @@ class Scope { ...@@ -44,7 +43,7 @@ class Scope {
private: private:
std::unordered_map<std::string, std::unique_ptr<Variable>> vars_; std::unordered_map<std::string, std::unique_ptr<Variable>> vars_;
std::shared_ptr<Scope> parent_ {nullptr}; std::shared_ptr<Scope> parent_{nullptr};
}; };
} // namespace framework } // namespace framework
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册