Skip to content
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

Clean benchmark build warnings #1038

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Clean benchmark build warnings #1038

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
134 changes: 37 additions & 97 deletions benchmark/hdf5/benchmark_float.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class Benchmark_float : public Benchmark_knowhere, public ::testing::Test {
conf[knowhere::indexparam::EF] = ef;

std::string data_type_str = get_data_type_name<T>();
printf("\n[%0.3f s] %s | %s(%s) | hnsw_M=%ld, efc=%ld, ef=%ld\n", get_time_diff(), ann_test_name_.c_str(),
printf("\n[%0.3f s] %s | %s(%s) | hnsw_M=%ld, efc=%ld, ef=%d\n", get_time_diff(), ann_test_name_.c_str(),
index_type_.c_str(), data_type_str.c_str(), hnsw_M, efc, ef);
printf("================================================================================\n");
for (auto refine_k : HNSW_REFINE_Ks_) {
Expand Down Expand Up @@ -319,6 +319,11 @@ class Benchmark_float : public Benchmark_knowhere, public ::testing::Test {
const std::vector<int32_t> ITOPK_SIZEs_ = {128, 192, 256};
};

#define TEST_INDEX(NAME, T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_##NAME<T>(conf)

TEST_F(Benchmark_float, TEST_BRUTE_FORCE) {
index_type_ = "BruteForce";

Expand All @@ -331,68 +336,48 @@ TEST_F(Benchmark_float, TEST_BRUTE_FORCE) {
TEST_F(Benchmark_float, TEST_IDMAP) {
index_type_ = knowhere::IndexEnum::INDEX_FAISS_IDMAP;

#define TEST_IDMAP(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_idmap<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
std::vector<int32_t> params = {};

TEST_IDMAP(knowhere::fp32, params);
TEST_IDMAP(knowhere::fp16, params);
TEST_IDMAP(knowhere::bf16, params);
TEST_INDEX(idmap, knowhere::fp32, params);
TEST_INDEX(idmap, knowhere::fp16, params);
TEST_INDEX(idmap, knowhere::bf16, params);
}

TEST_F(Benchmark_float, TEST_IVF_FLAT) {
index_type_ = knowhere::IndexEnum::INDEX_FAISS_IVFFLAT;

#define TEST_IVF(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_ivf<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
for (auto nlist : NLISTs_) {
conf[knowhere::indexparam::NLIST] = nlist;
std::vector<int32_t> params = {nlist};

TEST_IVF(knowhere::fp32, params);
TEST_IVF(knowhere::fp16, params);
TEST_IVF(knowhere::bf16, params);
TEST_INDEX(ivf, knowhere::fp32, params);
TEST_INDEX(ivf, knowhere::fp16, params);
TEST_INDEX(ivf, knowhere::bf16, params);
}
}

TEST_F(Benchmark_float, TEST_IVF_SQ8) {
index_type_ = knowhere::IndexEnum::INDEX_FAISS_IVFSQ8;

#define TEST_IVF(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_ivf<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
for (auto nlist : NLISTs_) {
conf[knowhere::indexparam::NLIST] = nlist;
std::vector<int32_t> params = {nlist};

TEST_IVF(knowhere::fp32, params);
TEST_IVF(knowhere::fp16, params);
TEST_IVF(knowhere::bf16, params);
TEST_INDEX(ivf, knowhere::fp32, params);
TEST_INDEX(ivf, knowhere::fp16, params);
TEST_INDEX(ivf, knowhere::bf16, params);
}
}

TEST_F(Benchmark_float, TEST_IVF_PQ) {
index_type_ = knowhere::IndexEnum::INDEX_FAISS_IVFPQ;

#define TEST_IVF(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_ivf<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
conf[knowhere::indexparam::NBITS] = NBITS_;
Expand All @@ -402,42 +387,32 @@ TEST_F(Benchmark_float, TEST_IVF_PQ) {
conf[knowhere::indexparam::NLIST] = nlist;
std::vector<int32_t> params = {nlist, m};

TEST_IVF(knowhere::fp32, params);
TEST_IVF(knowhere::fp16, params);
TEST_IVF(knowhere::bf16, params);
TEST_INDEX(ivf, knowhere::fp32, params);
TEST_INDEX(ivf, knowhere::fp16, params);
TEST_INDEX(ivf, knowhere::bf16, params);
}
}
}

TEST_F(Benchmark_float, TEST_SCANN) {
index_type_ = knowhere::IndexEnum::INDEX_FAISS_SCANN;

#define TEST_SCANN(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_scann<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
conf[knowhere::indexparam::WITH_RAW_DATA] = true;
for (auto nlist : NLISTs_) {
conf[knowhere::indexparam::NLIST] = nlist;
std::vector<int32_t> params = {nlist};

TEST_SCANN(knowhere::fp32, params);
TEST_SCANN(knowhere::fp16, params);
TEST_SCANN(knowhere::bf16, params);
TEST_INDEX(scann, knowhere::fp32, params);
TEST_INDEX(scann, knowhere::fp16, params);
TEST_INDEX(scann, knowhere::bf16, params);
}
}

TEST_F(Benchmark_float, TEST_HNSW_FLAT) {
index_type_ = knowhere::IndexEnum::INDEX_HNSW;

#define TEST_HNSW(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_hnsw<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
for (auto M : HNSW_Ms_) {
Expand All @@ -446,21 +421,16 @@ TEST_F(Benchmark_float, TEST_HNSW_FLAT) {
conf[knowhere::indexparam::EFCONSTRUCTION] = efc;
std::vector<int32_t> params = {M, efc};

TEST_HNSW(knowhere::fp32, params);
TEST_HNSW(knowhere::fp16, params);
TEST_HNSW(knowhere::bf16, params);
TEST_INDEX(hnsw, knowhere::fp32, params);
TEST_INDEX(hnsw, knowhere::fp16, params);
TEST_INDEX(hnsw, knowhere::bf16, params);
}
}
}

TEST_F(Benchmark_float, TEST_HNSW_SQ) {
index_type_ = knowhere::IndexEnum::INDEX_HNSW_SQ;

#define TEST_HNSW(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_hnsw_refine<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;

Expand All @@ -475,9 +445,9 @@ TEST_F(Benchmark_float, TEST_HNSW_SQ) {
conf[knowhere::indexparam::SQ_TYPE] = sq_type;
std::vector<std::string> params = {std::to_string(M), std::to_string(efc), sq_type};

TEST_HNSW(knowhere::fp32, params);
TEST_HNSW(knowhere::fp16, params);
TEST_HNSW(knowhere::bf16, params);
TEST_INDEX(hnsw_refine, knowhere::fp32, params);
TEST_INDEX(hnsw_refine, knowhere::fp16, params);
TEST_INDEX(hnsw_refine, knowhere::bf16, params);
}
}
}
Expand All @@ -486,11 +456,6 @@ TEST_F(Benchmark_float, TEST_HNSW_SQ) {
TEST_F(Benchmark_float, TEST_HNSW_PQ) {
index_type_ = knowhere::IndexEnum::INDEX_HNSW_PQ;

#define TEST_HNSW(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_hnsw_refine<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;

Expand All @@ -506,9 +471,9 @@ TEST_F(Benchmark_float, TEST_HNSW_PQ) {
conf[knowhere::indexparam::M] = pq_m;
std::vector<int32_t> params = {hnsw_m, efc, pq_m};

TEST_HNSW(knowhere::fp32, params);
TEST_HNSW(knowhere::fp16, params);
TEST_HNSW(knowhere::bf16, params);
TEST_INDEX(hnsw_refine, knowhere::fp32, params);
TEST_INDEX(hnsw_refine, knowhere::fp16, params);
TEST_INDEX(hnsw_refine, knowhere::bf16, params);
}
}
}
Expand All @@ -517,11 +482,6 @@ TEST_F(Benchmark_float, TEST_HNSW_PQ) {
TEST_F(Benchmark_float, TEST_HNSW_PRQ) {
index_type_ = knowhere::IndexEnum::INDEX_HNSW_PRQ;

#define TEST_HNSW(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_hnsw_refine<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;

Expand All @@ -536,9 +496,9 @@ TEST_F(Benchmark_float, TEST_HNSW_PRQ) {
conf[knowhere::indexparam::EFCONSTRUCTION] = efc;
std::vector<int32_t> params = {M, efc};

TEST_HNSW(knowhere::fp32, params);
TEST_HNSW(knowhere::fp16, params);
TEST_HNSW(knowhere::bf16, params);
TEST_INDEX(hnsw_refine, knowhere::fp32, params);
TEST_INDEX(hnsw_refine, knowhere::fp16, params);
TEST_INDEX(hnsw_refine, knowhere::bf16, params);
}
}
}
Expand Down Expand Up @@ -584,44 +544,29 @@ TEST_F(Benchmark_float, TEST_DISKANN) {
TEST_F(Benchmark_float, TEST_RAFT_BRUTE_FORCE) {
index_type_ = knowhere::IndexEnum::INDEX_RAFT_BRUTEFORCE;

#define TEST_RAFT_BF(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_idmap<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
std::vector<int32_t> params = {};

TEST_RAFT_BF(knowhere::fp32, params);
TEST_INDEX(idmap, knowhere::fp32, params);
}

TEST_F(Benchmark_float, TEST_RAFT_IVF_FLAT) {
index_type_ = knowhere::IndexEnum::INDEX_RAFT_IVFFLAT;

#define TEST_RAFT_IVF(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_ivf<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
for (auto nlist : NLISTs_) {
conf[knowhere::indexparam::NLIST] = nlist;
std::vector<int32_t> params = {nlist};

TEST_RAFT_IVF(knowhere::fp32, params);
TEST_INDEX(ivf, knowhere::fp32, params);
}
}

TEST_F(Benchmark_float, TEST_RAFT_IVF_PQ) {
index_type_ = knowhere::IndexEnum::INDEX_RAFT_IVFPQ;

#define TEST_RAFT_IVF(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_ivf<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;
conf[knowhere::indexparam::NBITS] = NBITS_;
Expand All @@ -631,27 +576,22 @@ TEST_F(Benchmark_float, TEST_RAFT_IVF_PQ) {
conf[knowhere::indexparam::NLIST] = nlist;
std::vector<int32_t> params = {nlist, m};

TEST_RAFT_IVF(knowhere::fp32, params);
TEST_INDEX(ivf, knowhere::fp32, params);
}
}
}

TEST_F(Benchmark_float, TEST_RAFT_CAGRA) {
index_type_ = knowhere::IndexEnum::INDEX_RAFT_CAGRA;

#define TEST_RAFT_CAGRA(T, X) \
index_file_name = get_index_name<T>(X); \
create_index<T>(index_file_name, conf); \
test_raft_cagra<T>(conf);

std::string index_file_name;
knowhere::Json conf = cfg_;

for (auto graph_degree : GRAPH_DEGREEs_) {
conf[knowhere::indexparam::GRAPH_DEGREE] = graph_degree;
conf[knowhere::indexparam::INTERMEDIATE_GRAPH_DEGREE] = graph_degree;
std::vector<int32_t> params = {graph_degree};
TEST_RAFT_CAGRA(knowhere::fp32, params);
TEST_INDEX(raft_cagra, knowhere::fp32, params);
}
}
#endif
Loading