diff --git a/paddle/framework/scope.cc b/paddle/framework/scope.cc index 31956aecb960396a082f1b8ec15dfa97bd7fefc6..e98559884906cf5907e618b48d9f63faa953e2c3 100644 --- a/paddle/framework/scope.cc +++ b/paddle/framework/scope.cc @@ -3,7 +3,7 @@ namespace paddle { namespace framework { -Error Scope::CreateVariable(const std::string &name) { +Error Scope::CreateVariable(const std::string& name) { if (name == "") { return Error("Variable name should not be empty"); } @@ -22,7 +22,7 @@ Variable* Scope::GetVarLocally(const std::string& name) const { return nullptr; } -Variable* Scope::GetVariable(const std::string &name) const { +Variable* Scope::GetVariable(const std::string& name) const { Variable* var = GetVarLocally(name); if (var != nullptr) { return var; @@ -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); if (var != nullptr) { return var; @@ -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; } } // namespace framework } // namespace paddle - diff --git a/paddle/framework/scope.h b/paddle/framework/scope.h index ad1ed2ddab901379555642cfa97165ab7581a9d9..90c8141e4f41a1c1cb73439012c38a60f24f0774 100644 --- a/paddle/framework/scope.h +++ b/paddle/framework/scope.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include "paddle/framework/variable.h" #include "paddle/utils/Error.h" @@ -11,16 +11,16 @@ namespace framework { const static Error AlreadyCreated("Variable has already been created"); /** - * Scope is an association of a name to Variable. All variables belong to `Scope`. - * You need to specify a scope to run a Net, i.e., `net.Run(&scope)`. One net can - * run in different scopes and update different variable in the scope. + * Scope is an association of a name to Variable. All variables belong to + * `Scope`. You need to specify a scope to run a Net, i.e., `net.Run(&scope)`. + * One net can run in different scopes and update different variable in the + * scope. */ class Scope { public: Scope() {} - explicit Scope(const std::shared_ptr &scope): - parent_(scope) {} + explicit Scope(const std::shared_ptr& scope) : parent_(scope) {} ~Scope() {} @@ -29,8 +29,7 @@ class Scope { Error __must_check CreateVariable(const std::string& name); // Get Variable from this Scope, this function will recursive find Variable - // from it's parent scope. - // Return nullptr if not found. + // from it's parent scope. Return nullptr if not found. Variable* GetVariable(const std::string& name) const; // find and return Variables in the scope it self. @@ -44,7 +43,7 @@ class Scope { private: std::unordered_map> vars_; - std::shared_ptr parent_ {nullptr}; + std::shared_ptr parent_{nullptr}; }; } // namespace framework