Skip to content

milvus
milvus

qq_35024513 / milvus
与 Fork 源项目一致

Fork自 milvus / milvus

通知 14
Star 0
Fork 0
milvus
milvus

体验新版 GitCode，发现更多精彩内容 >>

提交 65b46de1 编写于 作者: Y yudong.cai
浏览文件
操作

#89 code format 


Former-commit-id: ced158f26d9c18e38c7afb84ad17fdb6f9057259
上级 d3d6077e
显示空白变更内容
内联 并排
Showing with 136 addition and 146 deletion
core/src/index/unittest/faiss_benchmark/faiss_benchmark_test.cpp
浏览文件 @ 65b46de1
...@@ -17,28 +17,28 @@ ...@@ -17,28 +17,28 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <cassert>
#include <cmath> #include <cmath>
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <cassert>
#include <cstring> #include <cstring>
#include <faiss/AutoTune.h> #include <faiss/AutoTune.h>
#include <faiss/Index.h> #include <faiss/Index.h>
#include <faiss/IndexIVF.h> #include <faiss/IndexIVF.h>
#include <faiss/gpu/StandardGpuResources.h>
#include <faiss/gpu/GpuAutoTune.h> #include <faiss/gpu/GpuAutoTune.h>
#include <faiss/gpu/GpuIndexFlat.h> #include <faiss/gpu/GpuIndexFlat.h>
#include <faiss/gpu/StandardGpuResources.h>
#include <faiss/index_io.h> #include <faiss/index_io.h>
#include <faiss/utils.h> #include <faiss/utils.h>
#include <hdf5.h> #include <hdf5.h>
#include <vector>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <vector>
/***************************************************** /*****************************************************
* To run this test, please download the HDF5 from * To run this test, please download the HDF5 from
...@@ -46,17 +46,15 @@ ...@@ -46,17 +46,15 @@
* and install it to /usr/local/hdf5 . * and install it to /usr/local/hdf5 .
*****************************************************/ *****************************************************/
double elapsed() { double
elapsed() {
struct timeval tv; struct timeval tv;
gettimeofday(&tv, nullptr); gettimeofday(&tv, nullptr);
return tv.tv_sec + tv.tv_usec * 1e-6; return tv.tv_sec + tv.tv_usec * 1e-6;
} }
void* hdf5_read(const char *file_name, void*
const char *dataset_name, hdf5_read(const char* file_name, const char* dataset_name, H5T_class_t dataset_class, size_t& d_out, size_t& n_out) {
H5T_class_t dataset_class,
size_t &d_out,
size_t &n_out) {
hid_t file, dataset, datatype, dataspace, memspace; hid_t file, dataset, datatype, dataspace, memspace;
H5T_class_t t_class; /* data type class */ H5T_class_t t_class; /* data type class */
H5T_order_t order; /* data order */ H5T_order_t order; /* data order */
...@@ -149,30 +147,31 @@ void* hdf5_read(const char *file_name, ...@@ -149,30 +147,31 @@ void* hdf5_read(const char *file_name,
return data_out; return data_out;
} }
std::string get_index_file_name(const std::string& ann_test_name, std::string
const std::string& index_key, get_index_file_name(const std::string& ann_test_name, const std::string& index_key, int32_t data_loops) {
int32_t data_loops) {
size_t pos = index_key.find_first_of(',', 0); size_t pos = index_key.find_first_of(',', 0);
std::string file_name = ann_test_name; std::string file_name = ann_test_name;
file_name = file_name + "_" + index_key.substr(0, pos) + "_" + index_key.substr(pos+1); file_name = file_name + "_" + index_key.substr(0, pos) + "_" + index_key.substr(pos + 1);
file_name = file_name + "_" + std::to_string(data_loops) + ".index"; file_name = file_name + "_" + std::to_string(data_loops) + ".index";
return file_name; return file_name;
} }
bool parse_ann_test_name(const std::string& ann_test_name, bool
size_t &dim, parse_ann_test_name(const std::string& ann_test_name, size_t& dim, faiss::MetricType& metric_type) {
faiss::MetricType &metric_type) {
size_t pos1, pos2; size_t pos1, pos2;
if (ann_test_name.empty()) return false; if (ann_test_name.empty())
return false;
pos1 = ann_test_name.find_first_of('-', 0); pos1 = ann_test_name.find_first_of('-', 0);
if (pos1 == std::string::npos) return false; if (pos1 == std::string::npos)
return false;
pos2 = ann_test_name.find_first_of('-', pos1 + 1); pos2 = ann_test_name.find_first_of('-', pos1 + 1);
if (pos2 == std::string::npos) return false; if (pos2 == std::string::npos)
return false;
dim = std::stoi(ann_test_name.substr(pos1+1, pos2-pos1-1)); dim = std::stoi(ann_test_name.substr(pos1 + 1, pos2 - pos1 - 1));
std::string metric_str = ann_test_name.substr(pos2+1); std::string metric_str = ann_test_name.substr(pos2 + 1);
if (metric_str == "angular") { if (metric_str == "angular") {
metric_type = faiss::METRIC_INNER_PRODUCT; metric_type = faiss::METRIC_INNER_PRODUCT;
} else if (metric_str == "euclidean") { } else if (metric_str == "euclidean") {
...@@ -184,9 +183,8 @@ bool parse_ann_test_name(const std::string& ann_test_name, ...@@ -184,9 +183,8 @@ bool parse_ann_test_name(const std::string& ann_test_name,
return true; return true;
} }
void test_ann_hdf5(const std::string& ann_test_name, void
const std::string& index_key, test_ann_hdf5(const std::string& ann_test_name, const std::string& index_key, int32_t index_add_loops,
int32_t index_add_loops,
const std::vector<size_t>& nprobes) { const std::vector<size_t>& nprobes) {
double t0 = elapsed(); double t0 = elapsed();
...@@ -200,49 +198,47 @@ void test_ann_hdf5(const std::string& ann_test_name, ...@@ -200,49 +198,47 @@ void test_ann_hdf5(const std::string& ann_test_name,
return; return;
} }
faiss::Index * index; faiss::Index* index;
size_t d; size_t d;
std::string index_file_name = get_index_file_name(ann_test_name, index_key, index_add_loops); std::string index_file_name = get_index_file_name(ann_test_name, index_key, index_add_loops);
try { try {
index = faiss::read_index(index_file_name.c_str()); index = faiss::read_index(index_file_name.c_str());
d = dim; d = dim;
} } catch (...) {
catch (...) {
printf("Cannot read index file: %s\n", index_file_name.c_str()); printf("Cannot read index file: %s\n", index_file_name.c_str());
printf ("[%.3f s] Loading train set\n", elapsed() - t0); printf("[%.3f s] Loading train set\n", elapsed() - t0);
size_t nb; size_t nb;
float *xb = (float*)hdf5_read(ann_file_name.c_str(), "train", H5T_FLOAT, d, nb); float* xb = (float*)hdf5_read(ann_file_name.c_str(), "train", H5T_FLOAT, d, nb);
assert(d == dim || !"dataset does not have correct dimension"); assert(d == dim || !"dataset does not have correct dimension");
printf ("[%.3f s] Preparing index \"%s\" d=%ld\n", printf("[%.3f s] Preparing index \"%s\" d=%ld\n", elapsed() - t0, index_key.c_str(), d);
elapsed() - t0, index_key.c_str(), d);
index = faiss::index_factory(d, index_key.c_str(), metric_type); index = faiss::index_factory(d, index_key.c_str(), metric_type);
printf ("[%.3f s] Training on %ld vectors\n", elapsed() - t0, nb); printf("[%.3f s] Training on %ld vectors\n", elapsed() - t0, nb);
index->train(nb, xb); index->train(nb, xb);
printf ("[%.3f s] Loading database\n", elapsed() - t0); printf("[%.3f s] Loading database\n", elapsed() - t0);
// add index multiple times to get ~1G data set // add index multiple times to get ~1G data set
for (int i = 0; i < index_add_loops; i++) { for (int i = 0; i < index_add_loops; i++) {
printf ("[%.3f s] Indexing database, size %ld*%ld\n", elapsed() - t0, nb, d); printf("[%.3f s] Indexing database, size %ld*%ld\n", elapsed() - t0, nb, d);
index->add(nb, xb); index->add(nb, xb);
} }
faiss::write_index(index, index_file_name.c_str()); faiss::write_index(index, index_file_name.c_str());
delete [] xb; delete[] xb;
} }
size_t nq; size_t nq;
float *xq; float* xq;
{ {
printf ("[%.3f s] Loading queries\n", elapsed() - t0); printf("[%.3f s] Loading queries\n", elapsed() - t0);
size_t d2; size_t d2;
xq = (float*)hdf5_read(ann_file_name.c_str(), "test", H5T_FLOAT, d2, nq); xq = (float*)hdf5_read(ann_file_name.c_str(), "test", H5T_FLOAT, d2, nq);
...@@ -250,27 +246,26 @@ void test_ann_hdf5(const std::string& ann_test_name, ...@@ -250,27 +246,26 @@ void test_ann_hdf5(const std::string& ann_test_name,
} }
size_t k; // nb of results per query in the GT size_t k; // nb of results per query in the GT
faiss::Index::idx_t *gt; // nq * k matrix of ground-truth nearest-neighbors faiss::Index::idx_t* gt; // nq * k matrix of ground-truth nearest-neighbors
{ {
printf ("[%.3f s] Loading ground truth for %ld queries\n", elapsed() - t0, nq); printf("[%.3f s] Loading ground truth for %ld queries\n", elapsed() - t0, nq);
// load ground-truth and convert int to long // load ground-truth and convert int to long
size_t nq2; size_t nq2;
int *gt_int = (int*)hdf5_read(ann_file_name.c_str(), "neighbors", H5T_INTEGER, k, nq2); int* gt_int = (int*)hdf5_read(ann_file_name.c_str(), "neighbors", H5T_INTEGER, k, nq2);
assert(nq2 == nq || !"incorrect nb of ground truth entries"); assert(nq2 == nq || !"incorrect nb of ground truth entries");
gt = new faiss::Index::idx_t[k * nq]; gt = new faiss::Index::idx_t[k * nq];
for(int i = 0; i < k * nq; i++) { for (int i = 0; i < k * nq; i++) {
gt[i] = gt_int[i]; gt[i] = gt_int[i];
} }
delete [] gt_int; delete[] gt_int;
} }
for (auto nprobe : nprobes) { for (auto nprobe : nprobes) {
faiss::ParameterSpace params; faiss::ParameterSpace params;
printf ("[%.3f s] Setting parameter configuration 'nprobe=%lu' on index\n", elapsed() - t0, nprobe); printf("[%.3f s] Setting parameter configuration 'nprobe=%lu' on index\n", elapsed() - t0, nprobe);
std::string nprobe_str = "nprobe=" + std::to_string(nprobe); std::string nprobe_str = "nprobe=" + std::to_string(nprobe);
params.set_index_parameters(index, nprobe_str.c_str()); params.set_index_parameters(index, nprobe_str.c_str());
...@@ -278,11 +273,11 @@ void test_ann_hdf5(const std::string& ann_test_name, ...@@ -278,11 +273,11 @@ void test_ann_hdf5(const std::string& ann_test_name,
// output buffers // output buffers
#if 1 #if 1
const size_t NQ = 1000, K = 1000; const size_t NQ = 1000, K = 1000;
faiss::Index::idx_t *I = new faiss::Index::idx_t[NQ * K]; faiss::Index::idx_t* I = new faiss::Index::idx_t[NQ * K];
float *D = new float[NQ * K]; float* D = new float[NQ * K];
printf ("\n%s | %s | nprobe=%lu\n", ann_test_name.c_str(), index_key.c_str(), nprobe); printf("\n%s | %s | nprobe=%lu\n", ann_test_name.c_str(), index_key.c_str(), nprobe);
printf ("============================================================================================\n"); printf("============================================================================================\n");
for (size_t t_nq = 10; t_nq <= NQ; t_nq *= 10) { // nq = {10, 100, 1000} for (size_t t_nq = 10; t_nq <= NQ; t_nq *= 10) { // nq = {10, 100, 1000}
for (size_t t_k = 100; t_k <= K; t_k *= 10) { // k = {100, 1000} for (size_t t_k = 100; t_k <= K; t_k *= 10) { // k = {100, 1000}
faiss::indexIVF_stats.quantization_time = 0.0; faiss::indexIVF_stats.quantization_time = 0.0;
...@@ -301,7 +296,7 @@ void test_ann_hdf5(const std::string& ann_test_name, ...@@ -301,7 +296,7 @@ void test_ann_hdf5(const std::string& ann_test_name,
// consider: each result replicates DATA_LOOPS times // consider: each result replicates DATA_LOOPS times
for (int j_c = 0; j_c < k; j_c++) { for (int j_c = 0; j_c < k; j_c++) {
int r_c = I[i * t_k + j_c]; int r_c = I[i * t_k + j_c];
for (int j_g = 0; j_g < k/index_add_loops; j_g++) { for (int j_g = 0; j_g < k / index_add_loops; j_g++) {
if (gt[i * k + j_g] == r_c) { if (gt[i * k + j_g] == r_c) {
hit++; hit++;
continue; continue;
...@@ -309,33 +304,34 @@ void test_ann_hdf5(const std::string& ann_test_name, ...@@ -309,33 +304,34 @@ void test_ann_hdf5(const std::string& ann_test_name,
} }
} }
} }
printf("nq = %4ld, k = %4ld, elapse = %fs (quant = %fs, search = %fs), R@ = %.4f\n", printf("nq = %4ld, k = %4ld, elapse = %fs (quant = %fs, search = %fs), R@ = %.4f\n", t_nq, t_k,
t_nq, t_k, (t_end - t_start), (t_end - t_start), faiss::indexIVF_stats.quantization_time / 1000,
faiss::indexIVF_stats.quantization_time / 1000, faiss::indexIVF_stats.search_time / 1000, (hit / float(t_nq * k / index_add_loops)));
faiss::indexIVF_stats.search_time / 1000,
(hit / float(t_nq * k / index_add_loops)));
} }
} }
printf ("============================================================================================\n"); printf("============================================================================================\n");
#else #else
printf ("[%.3f s] Perform a search on %ld queries\n", elapsed() - t0, nq); printf("[%.3f s] Perform a search on %ld queries\n", elapsed() - t0, nq);
faiss::Index::idx_t *I = new faiss::Index::idx_t[nq * k]; faiss::Index::idx_t* I = new faiss::Index::idx_t[nq * k];
float *D = new float[nq * k]; float* D = new float[nq * k];
index->search(nq, xq, k, D, I); index->search(nq, xq, k, D, I);
printf ("[%.3f s] Compute recalls\n", elapsed() - t0); printf("[%.3f s] Compute recalls\n", elapsed() - t0);
// evaluate result by hand. // evaluate result by hand.
int n_1 = 0, n_10 = 0, n_100 = 0; int n_1 = 0, n_10 = 0, n_100 = 0;
for(int i = 0; i < nq; i++) { for (int i = 0; i < nq; i++) {
int gt_nn = gt[i * k]; int gt_nn = gt[i * k];
for(int j = 0; j < k; j++) { for (int j = 0; j < k; j++) {
if (I[i * k + j] == gt_nn) { if (I[i * k + j] == gt_nn) {
if(j < 1) n_1++; if (j < 1)
if(j < 10) n_10++; n_1++;
if(j < 100) n_100++; if (j < 10)
n_10++;
if (j < 100)
n_100++;
} }
} }
} }
...@@ -344,21 +340,20 @@ void test_ann_hdf5(const std::string& ann_test_name, ...@@ -344,21 +340,20 @@ void test_ann_hdf5(const std::string& ann_test_name,
printf("R@100 = %.4f\n", n_100 / float(nq)); printf("R@100 = %.4f\n", n_100 / float(nq));
#endif #endif
printf ("[%.3f s] Search test done\n\n", elapsed() - t0); printf("[%.3f s] Search test done\n\n", elapsed() - t0);
delete [] I; delete[] I;
delete [] D; delete[] D;
} }
delete [] xq; delete[] xq;
delete [] gt; delete[] gt;
delete index; delete index;
} }
#ifdef CUSTOMIZATION #ifdef CUSTOMIZATION
void test_ivfsq8h_gpu(const std::string& ann_test_name, void
int32_t index_add_loops, test_ivfsq8h_gpu(const std::string& ann_test_name, int32_t index_add_loops, const std::vector<size_t>& nprobes) {
const std::vector<size_t>& nprobes){
double t0 = elapsed(); double t0 = elapsed();
const std::string ann_file_name = ann_test_name + ".hdf5"; const std::string ann_file_name = ann_test_name + ".hdf5";
...@@ -380,44 +375,43 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name, ...@@ -380,44 +375,43 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name,
size_t d; size_t d;
std::string index_file_name = get_index_file_name(ann_test_name, index_key, index_add_loops); std::string index_file_name = get_index_file_name(ann_test_name, index_key, index_add_loops);
try{ try {
cpu_index = faiss::read_index(index_file_name.c_str()); cpu_index = faiss::read_index(index_file_name.c_str());
d = dim; d = dim;
} } catch (...) {
catch (...){
printf("Cannot read index file: %s\n", index_file_name.c_str()); printf("Cannot read index file: %s\n", index_file_name.c_str());
printf ("[%.3f s] Loading train set\n", elapsed() - t0); printf("[%.3f s] Loading train set\n", elapsed() - t0);
size_t nb; size_t nb;
float *xb = (float*)hdf5_read(ann_file_name.c_str(), "train", H5T_FLOAT, d, nb); float* xb = (float*)hdf5_read(ann_file_name.c_str(), "train", H5T_FLOAT, d, nb);
assert(d == dim || !"dataset does not have correct dimension"); assert(d == dim || !"dataset does not have correct dimension");
printf ("[%.3f s] Preparing index \"%s\" d=%ld\n", elapsed() - t0, index_key.c_str(), d); printf("[%.3f s] Preparing index \"%s\" d=%ld\n", elapsed() - t0, index_key.c_str(), d);
faiss::Index *ori_index = faiss::index_factory(d, index_key.c_str(), metric_type); faiss::Index* ori_index = faiss::index_factory(d, index_key.c_str(), metric_type);
auto device_index = faiss::gpu::index_cpu_to_gpu(&res, 0, ori_index); auto device_index = faiss::gpu::index_cpu_to_gpu(&res, 0, ori_index);
printf ("[%.3f s] Training on %ld vectors\n", elapsed() - t0, nb); printf("[%.3f s] Training on %ld vectors\n", elapsed() - t0, nb);
device_index->train(nb, xb); device_index->train(nb, xb);
printf ("[%.3f s] Loading database\n", elapsed() - t0); printf("[%.3f s] Loading database\n", elapsed() - t0);
for (int i = 0; i < index_add_loops; i++) { for (int i = 0; i < index_add_loops; i++) {
printf ("[%.3f s] Indexing database, size %ld*%ld\n", elapsed() - t0, nb, d); printf("[%.3f s] Indexing database, size %ld*%ld\n", elapsed() - t0, nb, d);
device_index->add(nb, xb); device_index->add(nb, xb);
} }
cpu_index = faiss::gpu::index_gpu_to_cpu(device_index); cpu_index = faiss::gpu::index_gpu_to_cpu(device_index);
faiss::write_index(cpu_index, index_file_name.c_str()); faiss::write_index(cpu_index, index_file_name.c_str());
delete []xb; delete[] xb;
} }
faiss::IndexIVF *cpu_ivf_index = dynamic_cast<faiss::IndexIVF*>(cpu_index); faiss::IndexIVF* cpu_ivf_index = dynamic_cast<faiss::IndexIVF*>(cpu_index);
if(cpu_ivf_index != nullptr) { if (cpu_ivf_index != nullptr) {
cpu_ivf_index->to_readonly(); cpu_ivf_index->to_readonly();
} }
...@@ -433,9 +427,9 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name, ...@@ -433,9 +427,9 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name,
delete index; delete index;
size_t nq; size_t nq;
float *xq; float* xq;
{ {
printf ("[%.3f s] Loading queries\n", elapsed() - t0); printf("[%.3f s] Loading queries\n", elapsed() - t0);
size_t d2; size_t d2;
xq = (float*)hdf5_read(ann_file_name.c_str(), "test", H5T_FLOAT, d2, nq); xq = (float*)hdf5_read(ann_file_name.c_str(), "test", H5T_FLOAT, d2, nq);
...@@ -443,40 +437,39 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name, ...@@ -443,40 +437,39 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name,
} }
size_t k; size_t k;
faiss::Index::idx_t *gt; faiss::Index::idx_t* gt;
{ {
printf ("[%.3f s] Loading ground truth for %ld queries\n", elapsed() - t0, nq); printf("[%.3f s] Loading ground truth for %ld queries\n", elapsed() - t0, nq);
size_t nq2; size_t nq2;
int *gt_int = (int*)hdf5_read(ann_file_name.c_str(), "neighbors", H5T_INTEGER, k, nq2); int* gt_int = (int*)hdf5_read(ann_file_name.c_str(), "neighbors", H5T_INTEGER, k, nq2);
assert(nq2 == nq || !"incorrect nb of ground truth entries"); assert(nq2 == nq || !"incorrect nb of ground truth entries");
gt = new faiss::Index::idx_t[k * nq]; gt = new faiss::Index::idx_t[k * nq];
for (unsigned long i = 0; i < k * nq; ++i) { for (unsigned long i = 0; i < k * nq; ++i) {
gt[i] = gt_int[i]; gt[i] = gt_int[i];
} }
delete []gt_int; delete[] gt_int;
} }
for (auto nprobe : nprobes){ for (auto nprobe : nprobes) {
printf ("[%.3f s] Setting parameter configuration 'nprobe=%lu' on index\n", printf("[%.3f s] Setting parameter configuration 'nprobe=%lu' on index\n", elapsed() - t0, nprobe);
elapsed() - t0, nprobe);
auto ivf_index = dynamic_cast<faiss::IndexIVF *>(cpu_index); auto ivf_index = dynamic_cast<faiss::IndexIVF*>(cpu_index);
ivf_index->nprobe = nprobe; ivf_index->nprobe = nprobe;
auto is_gpu_flat_index = dynamic_cast<faiss::gpu::GpuIndexFlat*>(ivf_index->quantizer); auto is_gpu_flat_index = dynamic_cast<faiss::gpu::GpuIndexFlat*>(ivf_index->quantizer);
if(is_gpu_flat_index == nullptr) { if (is_gpu_flat_index == nullptr) {
delete ivf_index->quantizer; delete ivf_index->quantizer;
ivf_index->quantizer = index_composition.quantizer; ivf_index->quantizer = index_composition.quantizer;
} }
const size_t NQ = 1000, K = 1000; const size_t NQ = 1000, K = 1000;
long *I = new faiss::Index::idx_t[NQ * K]; long* I = new faiss::Index::idx_t[NQ * K];
float *D = new float[NQ * K]; float* D = new float[NQ * K];
printf ("\n%s | %s-gpu | nprobe=%lu\n", ann_test_name.c_str(), index_key.c_str(), nprobe); printf("\n%s | %s-gpu | nprobe=%lu\n", ann_test_name.c_str(), index_key.c_str(), nprobe);
printf ("============================================================================================\n"); printf("============================================================================================\n");
for (size_t t_nq = 10; t_nq <= NQ; t_nq *= 10) { // nq = {10, 100, 1000} for (size_t t_nq = 10; t_nq <= NQ; t_nq *= 10) { // nq = {10, 100, 1000}
for (size_t t_k = 100; t_k <= K; t_k *= 10) { // k = {100, 1000} for (size_t t_k = 100; t_k <= K; t_k *= 10) { // k = {100, 1000}
faiss::indexIVF_stats.quantization_time = 0.0; faiss::indexIVF_stats.quantization_time = 0.0;
...@@ -495,7 +488,7 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name, ...@@ -495,7 +488,7 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name,
// consider: each result replicates DATA_LOOPS times // consider: each result replicates DATA_LOOPS times
for (unsigned long j_c = 0; j_c < k; j_c++) { for (unsigned long j_c = 0; j_c < k; j_c++) {
int r_c = I[i * t_k + j_c]; int r_c = I[i * t_k + j_c];
for (unsigned long j_g = 0; j_g < k/index_add_loops; j_g++) { for (unsigned long j_g = 0; j_g < k / index_add_loops; j_g++) {
if (gt[i * k + j_g] == r_c) { if (gt[i * k + j_g] == r_c) {
hit++; hit++;
continue; continue;
...@@ -503,23 +496,21 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name, ...@@ -503,23 +496,21 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name,
} }
} }
} }
printf("nq = %4ld, k = %4ld, elapse = %fs (quant = %fs, search = %fs), R@ = %.4f\n", printf("nq = %4ld, k = %4ld, elapse = %fs (quant = %fs, search = %fs), R@ = %.4f\n", t_nq, t_k,
t_nq, t_k, (t_end - t_start), (t_end - t_start), faiss::indexIVF_stats.quantization_time / 1000,
faiss::indexIVF_stats.quantization_time / 1000, faiss::indexIVF_stats.search_time / 1000, (hit / float(t_nq * k / index_add_loops)));
faiss::indexIVF_stats.search_time / 1000,
(hit / float(t_nq * k / index_add_loops)));
} }
} }
printf ("============================================================================================\n"); printf("============================================================================================\n");
printf ("[%.3f s] Search test done\n\n", elapsed() - t0); printf("[%.3f s] Search test done\n\n", elapsed() - t0);
delete [] I; delete[] I;
delete [] D; delete[] D;
} }
delete [] xq; delete[] xq;
delete [] gt; delete[] gt;
delete cpu_index; delete cpu_index;
} }
#endif #endif
...@@ -536,7 +527,7 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name, ...@@ -536,7 +527,7 @@ void test_ivfsq8h_gpu(const std::string& ann_test_name,
* MNIST 784 60,000 10,000 100 Euclidean HDF5 (217MB) * MNIST 784 60,000 10,000 100 Euclidean HDF5 (217MB)
* NYTimes 256 290,000 10,000 100 Angular HDF5 (301MB) * NYTimes 256 290,000 10,000 100 Angular HDF5 (301MB)
* SIFT 128 1,000,000 10,000 100 Euclidean HDF5 (501MB) * SIFT 128 1,000,000 10,000 100 Euclidean HDF5 (501MB)
*************************************************************************************/ *************************************************************************************/
TEST(FAISSTEST, BENCHMARK) { TEST(FAISSTEST, BENCHMARK) {
test_ann_hdf5("sift-128-euclidean", "IVF4096,Flat", 2, {8, 128}); test_ann_hdf5("sift-128-euclidean", "IVF4096,Flat", 2, {8, 128});
...@@ -553,4 +544,3 @@ TEST(FAISSTEST, BENCHMARK) { ...@@ -553,4 +544,3 @@ TEST(FAISSTEST, BENCHMARK) {
test_ivfsq8h_gpu("glove-200-angular", 1, {8, 128}); test_ivfsq8h_gpu("glove-200-angular", 1, {8, 128});
#endif #endif
} }
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或