Skip to content

add transfer_scope_cache unit-test #18467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luotao1 merged 1 commit into from
Jul 3, 2019
Merged

add transfer_scope_cache unit-test #18467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions paddle/fluid/framework/transfer_scope_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,5 @@ Scope* TryCreateTransferScope(OpKernelType type0, OpKernelType type1,
return new_scope;
}

void RemoveKidsFromTransferScopeCache(Scope* scope) {
auto it = global_transfer_scope_cache().find(scope);
if (it != global_transfer_scope_cache().end()) {
global_transfer_scope_cache().erase(it);
}
for (auto* s : scope->kids()) {
auto it = global_transfer_scope_cache().find(s);
if (it != global_transfer_scope_cache().end()) {
global_transfer_scope_cache().erase(it);
}
}

// remove global transfer data cache
auto& cache = global_transfer_data_cache();
for (auto it = cache.begin(); it != cache.end();) {
if (it->second == scope)
it = cache.erase(it);
else
it++;
}
}

} // namespace framework
} // namespace paddle
2 changes: 0 additions & 2 deletions paddle/fluid/framework/transfer_scope_cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,5 @@ static size_t CombineHash(size_t seed, size_t a) {
Scope* TryCreateTransferScope(OpKernelType type0, OpKernelType type1,
const Scope* scope);

void RemoveKidsFromTransferScopeCache(Scope* scope);

} // namespace framework
} // namespace paddle
40 changes: 40 additions & 0 deletions paddle/fluid/inference/tests/api/analyzer_bert_tester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/fluid/framework/transfer_scope_cache.h"
#include "paddle/fluid/inference/tests/api/tester_helper.h"

namespace paddle {
Expand Down Expand Up @@ -228,5 +229,44 @@ TEST(Analyzer_bert, compare_determine) {
CompareDeterministic(reinterpret_cast<const PaddlePredictor::Config *>(&cfg),
inputs);
}

TEST(Analyzer_bert, transfer_scope_cache) {
AnalysisConfig config;
SetConfig(&config);

std::vector<PaddleTensor> input, output;
auto predictor = CreatePaddlePredictor<AnalysisConfig>(config);

int threads_num = 10;
std::vector<std::thread> threads;
std::unordered_set<std::unordered_set<paddle::framework::Scope *> *>
global_transfer_scope_cache;
std::unordered_set<std::unordered_map<size_t, paddle::framework::Scope *> *>
global_transfer_data_cache;

std::ifstream fin(FLAGS_infer_data);
std::string line;

for (int i = 0; i < threads_num; i++) {
threads.emplace_back([&, i]() {
std::getline(fin, line);
ParseLine(line, &input);
predictor->Run(input, &output, FLAGS_batch_size);
global_transfer_scope_cache.insert(
&paddle::framework::global_transfer_scope_cache());
global_transfer_data_cache.insert(
&paddle::framework::global_transfer_data_cache());
});
threads[0].join();
threads.clear();
std::vector<PaddleTensor>().swap(input);
}
// Since paddle::framework::global_transfer_scope_cache() and
// paddle::framework::global_transfer_data_cache() are thread_local,
// their pointer should be different among different thread id.
PADDLE_ENFORCE(global_transfer_scope_cache.size(), threads_num);
PADDLE_ENFORCE(global_transfer_data_cache.size(), threads_num);

@luotao1 luotao1 Jul 2, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The size should be 1 in #18428 specific mkldnn tid setting mode.

@Superjomn Superjomn Jul 3, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the cpu_num set -1 for MKLDNN tested?

@luotao1 luotao1 Jul 3, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since #18453 refine api and const variable name to make it sense. Then

if (enable_mkldnn_cache_clear_mode) platform:: set_cur_mkldnn_session_id(-1); 
...
if (enable_mkldnn_cache_clear_mode) {
    PADDLE_ENFORCE(global_transfer_scope_cache.size(), 1);
  } else {
    PADDLE_ENFORCE(global_transfer_scope_cache.size(), threads_num);
  }

}

} // namespace inference
} // namespace paddle