Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into shufflechannel
shippingwang
6 years ago
commit
5631fc0817
@ -0,0 +1,178 @@
|
|||||||
|
// 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/tests/api/tester_helper.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace inference {
|
||||||
|
using contrib::AnalysisConfig;
|
||||||
|
|
||||||
|
struct DataRecord {
|
||||||
|
std::vector<std::vector<int64_t>> query_data_all, title_data_all;
|
||||||
|
std::vector<size_t> lod1, lod2;
|
||||||
|
size_t batch_iter{0};
|
||||||
|
size_t batch_size{1};
|
||||||
|
size_t num_samples; // total number of samples
|
||||||
|
DataRecord() = default;
|
||||||
|
explicit DataRecord(const std::string &path, int batch_size = 1)
|
||||||
|
: batch_size(batch_size) {
|
||||||
|
Load(path);
|
||||||
|
}
|
||||||
|
DataRecord NextBatch() {
|
||||||
|
DataRecord data;
|
||||||
|
size_t batch_end = batch_iter + batch_size;
|
||||||
|
// NOTE skip the final batch, if no enough data is provided.
|
||||||
|
if (batch_end <= query_data_all.size()) {
|
||||||
|
data.query_data_all.assign(query_data_all.begin() + batch_iter,
|
||||||
|
query_data_all.begin() + batch_end);
|
||||||
|
data.title_data_all.assign(title_data_all.begin() + batch_iter,
|
||||||
|
title_data_all.begin() + batch_end);
|
||||||
|
// Prepare LoDs
|
||||||
|
data.lod1.push_back(0);
|
||||||
|
data.lod2.push_back(0);
|
||||||
|
CHECK(!data.query_data_all.empty());
|
||||||
|
CHECK(!data.title_data_all.empty());
|
||||||
|
CHECK_EQ(data.query_data_all.size(), data.title_data_all.size());
|
||||||
|
for (size_t j = 0; j < data.query_data_all.size(); j++) {
|
||||||
|
// calculate lod
|
||||||
|
data.lod1.push_back(data.lod1.back() + data.query_data_all[j].size());
|
||||||
|
data.lod2.push_back(data.lod2.back() + data.title_data_all[j].size());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
batch_iter += batch_size;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
void Load(const std::string &path) {
|
||||||
|
std::ifstream file(path);
|
||||||
|
std::string line;
|
||||||
|
int num_lines = 0;
|
||||||
|
while (std::getline(file, line)) {
|
||||||
|
num_lines++;
|
||||||
|
std::vector<std::string> data;
|
||||||
|
split(line, '\t', &data);
|
||||||
|
// load query data
|
||||||
|
std::vector<int64_t> query_data;
|
||||||
|
split_to_int64(data[0], ' ', &query_data);
|
||||||
|
// load title data
|
||||||
|
std::vector<int64_t> title_data;
|
||||||
|
split_to_int64(data[1], ' ', &title_data);
|
||||||
|
query_data_all.push_back(std::move(query_data));
|
||||||
|
title_data_all.push_back(std::move(title_data));
|
||||||
|
}
|
||||||
|
num_samples = num_lines;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
void PrepareInputs(std::vector<PaddleTensor> *input_slots, DataRecord *data,
|
||||||
|
int batch_size) {
|
||||||
|
PaddleTensor lod_query_tensor, lod_title_tensor;
|
||||||
|
lod_query_tensor.name = "left";
|
||||||
|
lod_title_tensor.name = "right";
|
||||||
|
auto one_batch = data->NextBatch();
|
||||||
|
int size1 = one_batch.lod1[one_batch.lod1.size() - 1]; // token batch size
|
||||||
|
int size2 = one_batch.lod2[one_batch.lod2.size() - 1]; // token batch size
|
||||||
|
lod_query_tensor.shape.assign({size1, 1});
|
||||||
|
lod_query_tensor.lod.assign({one_batch.lod1});
|
||||||
|
lod_title_tensor.shape.assign({size2, 1});
|
||||||
|
lod_title_tensor.lod.assign({one_batch.lod2});
|
||||||
|
// assign data
|
||||||
|
TensorAssignData<int64_t>(&lod_query_tensor, one_batch.query_data_all);
|
||||||
|
TensorAssignData<int64_t>(&lod_title_tensor, one_batch.title_data_all);
|
||||||
|
// Set inputs.
|
||||||
|
input_slots->assign({lod_query_tensor, lod_title_tensor});
|
||||||
|
for (auto &tensor : *input_slots) {
|
||||||
|
tensor.dtype = PaddleDType::INT64;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SetConfig(contrib::AnalysisConfig *cfg) {
|
||||||
|
cfg->model_dir = FLAGS_infer_model;
|
||||||
|
cfg->use_gpu = false;
|
||||||
|
cfg->device = 0;
|
||||||
|
cfg->specify_input_name = true;
|
||||||
|
cfg->enable_ir_optim = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SetInput(std::vector<std::vector<PaddleTensor>> *inputs) {
|
||||||
|
DataRecord data(FLAGS_infer_data, FLAGS_batch_size);
|
||||||
|
std::vector<PaddleTensor> input_slots;
|
||||||
|
int epoch = FLAGS_test_all_data ? data.num_samples / FLAGS_batch_size : 1;
|
||||||
|
LOG(INFO) << "number of samples: " << epoch * FLAGS_batch_size;
|
||||||
|
for (int bid = 0; bid < epoch; ++bid) {
|
||||||
|
PrepareInputs(&input_slots, &data, FLAGS_batch_size);
|
||||||
|
(*inputs).emplace_back(input_slots);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Easy for profiling independently.
|
||||||
|
TEST(Analyzer_MM_DNN, profile) {
|
||||||
|
contrib::AnalysisConfig cfg;
|
||||||
|
SetConfig(&cfg);
|
||||||
|
std::vector<PaddleTensor> outputs;
|
||||||
|
|
||||||
|
std::vector<std::vector<PaddleTensor>> input_slots_all;
|
||||||
|
SetInput(&input_slots_all);
|
||||||
|
TestPrediction(reinterpret_cast<const PaddlePredictor::Config *>(&cfg),
|
||||||
|
input_slots_all, &outputs, FLAGS_num_threads);
|
||||||
|
|
||||||
|
if (FLAGS_num_threads == 1 && !FLAGS_test_all_data) {
|
||||||
|
PADDLE_ENFORCE_EQ(outputs.size(), 2UL);
|
||||||
|
for (auto &output : outputs) {
|
||||||
|
size_t size = GetSize(output);
|
||||||
|
PADDLE_ENFORCE_GT(size, 0);
|
||||||
|
float *result = static_cast<float *>(output.data.data());
|
||||||
|
// output is probability, which is in (-1, 1).
|
||||||
|
for (size_t i = 0; i < size; i++) {
|
||||||
|
EXPECT_GT(result[i], -1);
|
||||||
|
EXPECT_LT(result[i], 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check the fuse status
|
||||||
|
TEST(Analyzer_MM_DNN, fuse_statis) {
|
||||||
|
contrib::AnalysisConfig cfg;
|
||||||
|
SetConfig(&cfg);
|
||||||
|
|
||||||
|
int num_ops;
|
||||||
|
auto predictor = CreatePaddlePredictor<AnalysisConfig>(cfg);
|
||||||
|
auto fuse_statis = GetFuseStatis(
|
||||||
|
static_cast<AnalysisPredictor *>(predictor.get()), &num_ops);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compare result of NativeConfig and AnalysisConfig
|
||||||
|
TEST(Analyzer_MM_DNN, compare) {
|
||||||
|
contrib::AnalysisConfig cfg;
|
||||||
|
SetConfig(&cfg);
|
||||||
|
|
||||||
|
std::vector<std::vector<PaddleTensor>> input_slots_all;
|
||||||
|
SetInput(&input_slots_all);
|
||||||
|
CompareNativeAndAnalysis(
|
||||||
|
reinterpret_cast<const PaddlePredictor::Config *>(&cfg), input_slots_all);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compare Deterministic result
|
||||||
|
TEST(Analyzer_MM_DNN, compare_determine) {
|
||||||
|
AnalysisConfig cfg;
|
||||||
|
SetConfig(&cfg);
|
||||||
|
|
||||||
|
std::vector<std::vector<PaddleTensor>> input_slots_all;
|
||||||
|
SetInput(&input_slots_all);
|
||||||
|
CompareDeterministic(reinterpret_cast<const PaddlePredictor::Config *>(&cfg),
|
||||||
|
input_slots_all);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace inference
|
||||||
|
} // namespace paddle
|
||||||
@ -1,42 +0,0 @@
|
|||||||
// 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 "paddle/fluid/framework/tensor.h"
|
|
||||||
#include "paddle/fluid/platform/temporary_allocator.h"
|
|
||||||
namespace paddle {
|
|
||||||
namespace platform {
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
paddle::framework::Tensor GetTensor(
|
|
||||||
memory::allocation::AllocationPtr temp_allocation_ptr,
|
|
||||||
const framework::DDim &dim) {
|
|
||||||
auto &deleter = temp_allocation_ptr.get_deleter();
|
|
||||||
auto *allocation_ptr = temp_allocation_ptr.release();
|
|
||||||
auto shared_allocation =
|
|
||||||
std::shared_ptr<memory::allocation::Allocation>(allocation_ptr, deleter);
|
|
||||||
|
|
||||||
PADDLE_ENFORCE(dynamic_cast<TemporaryAllocation *>(allocation_ptr) != nullptr,
|
|
||||||
"The AllocationPtr must be TemporaryAllocation.");
|
|
||||||
PADDLE_ENFORCE_EQ(allocation_ptr->size(),
|
|
||||||
framework::product(dim) * sizeof(T));
|
|
||||||
|
|
||||||
paddle::framework::Tensor temp_tensor(std::type_index(typeid(T)));
|
|
||||||
temp_tensor.Resize(dim);
|
|
||||||
temp_tensor.ResetHolder(std::move(shared_allocation));
|
|
||||||
return temp_tensor;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace platform
|
|
||||||
} // namespace paddle
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue