[1.1] Bugfix/tensorarray (#14044)
Yan Chunwei
6 years ago
committed by
GitHub
parent
33b4920d2d
commit
ee74be3a49
@ -0,0 +1,50 @@
|
||||
// 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/api/details/reset_tensor_array.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace details {
|
||||
|
||||
// Should be called after the parameters are loaded.
|
||||
void TensorArrayBatchCleaner::CollectTensorArrays(framework::Scope *scope) {
|
||||
if (flag_) {
|
||||
for (auto &var_name : scope->LocalVarNames()) {
|
||||
auto *var = scope->FindVar(var_name);
|
||||
// TODO(Superjomn) should avoid the case when a TensorArray is a
|
||||
// parameter.
|
||||
if (var_name == "feed" || var_name == "fetch") continue;
|
||||
if (var->Type() == typeid(framework::LoDTensorArray)) {
|
||||
VLOG(4) << "collect " << var_name;
|
||||
arrays_.push_back(var->GetMutable<framework::LoDTensorArray>());
|
||||
}
|
||||
}
|
||||
for (auto *kid : scope->kids()) {
|
||||
CollectTensorArrays(kid);
|
||||
}
|
||||
|
||||
VLOG(3) << "Collect " << arrays_.size() << " arrays";
|
||||
flag_ = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Should be called when `Run` finished.
|
||||
void TensorArrayBatchCleaner::ResetTensorArray() {
|
||||
for (auto *arr : arrays_) {
|
||||
arr->clear();
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace details
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,37 @@
|
||||
// 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 <vector>
|
||||
#include "paddle/fluid/framework/lod_tensor_array.h"
|
||||
#include "paddle/fluid/framework/scope.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace details {
|
||||
|
||||
// Clean the TensorArray each batch to make the behavior the same with the
|
||||
// training phase.
|
||||
struct TensorArrayBatchCleaner {
|
||||
// Fix the tensor array not clear in the inference scenarios.
|
||||
void CollectTensorArrays(framework::Scope *scope);
|
||||
void ResetTensorArray();
|
||||
|
||||
private:
|
||||
bool flag_{true};
|
||||
std::vector<framework::LoDTensorArray *> arrays_;
|
||||
};
|
||||
|
||||
} // namespace details
|
||||
} // namespace paddle
|
||||
Loading…
Reference in new issue