diff --git a/paddle/fluid/framework/executor.h b/paddle/fluid/framework/executor.h index d0d12b307205a76fbf4669ac060223329b41b533..a6db5c8d4136f726106f0ce4debd145d6d14fb45 100644 --- a/paddle/fluid/framework/executor.h +++ b/paddle/fluid/framework/executor.h @@ -44,7 +44,8 @@ struct ExecutorPrepareContext { std::vector> ops_; - std::unordered_map> unused_vars_; + std::unordered_map> + unused_vars_; bool force_disable_gc_{false}; }; diff --git a/paddle/fluid/framework/executor_gc_helper.cc b/paddle/fluid/framework/executor_gc_helper.cc index 77b0977b5a47fdf4413e75c4e89cf638949e937f..1712d66cf4c99f0c01bf2ba2431bf41f457390db 100644 --- a/paddle/fluid/framework/executor_gc_helper.cc +++ b/paddle/fluid/framework/executor_gc_helper.cc @@ -89,10 +89,10 @@ static bool VarCanBeDeleted(const std::string &name, const BlockDesc &block, type == proto::VarType::LOD_TENSOR_ARRAY; } -std::unordered_map> GetUnusedVars( - const BlockDesc &block, - const std::vector> &ops, - const std::vector &skip_var_list) { +std::unordered_map> +GetUnusedVars(const BlockDesc &block, + const std::vector> &ops, + const std::vector &skip_var_list) { std::unordered_set skip_vars(skip_var_list.begin(), skip_var_list.end()); @@ -134,7 +134,7 @@ std::unordered_map> GetUnusedVars( } } - std::unordered_map> result; + std::unordered_map> result; for (auto &name_op_idx_pair : var_op_idx_map) { auto &name = name_op_idx_pair.first; size_t op_idx = name_op_idx_pair.second; @@ -144,8 +144,8 @@ std::unordered_map> GetUnusedVars( } void DeleteUnusedTensors( - const Scope &scope, OperatorBase *op, - const std::unordered_map> + const Scope &scope, const OperatorBase *op, + const std::unordered_map> &delete_vars_map, GarbageCollector *gc) { auto iter = delete_vars_map.find(op); diff --git a/paddle/fluid/framework/executor_gc_helper.h b/paddle/fluid/framework/executor_gc_helper.h index 8553273f8242844d0203d7bcd90ea2090b65826c..a4c71c5304e05e3d0dca6ca08d955f39b779556b 100644 --- a/paddle/fluid/framework/executor_gc_helper.h +++ b/paddle/fluid/framework/executor_gc_helper.h @@ -26,15 +26,15 @@ namespace paddle { namespace framework { // Result map: op -> variable names that can be deleted after op runs -std::unordered_map> GetUnusedVars( - const BlockDesc &block, - const std::vector> &ops, - const std::vector &skip_vars); +std::unordered_map> +GetUnusedVars(const BlockDesc &block, + const std::vector> &ops, + const std::vector &skip_vars); // Collect unused tensors after op runs void DeleteUnusedTensors( - const Scope &scope, OperatorBase *op, - const std::unordered_map> + const Scope &scope, const OperatorBase *op, + const std::unordered_map> &delete_vars_map, GarbageCollector *gc);