Commit 39fee711 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #123 from Heisenberg-Y/0.5.1-ezio 

[skip ci] refine the copy time test for faiss benchmark

Former-commit-id: fed9741dd7b4e9550e5f8e5d2c118db33995ac78
parents b1d7b02b d95b3906

core/src/index/unittest/faiss_benchmark/faiss_benchmark_test.cpp

+30 −20
Original line number Diff line number Diff line
@@ -426,26 +426,6 @@ test_ivfsq8h(const std::string& ann_test_name, int32_t index_add_loops, const st 
        cpu_ivf_index->to_readonly();

    }



    faiss::gpu::GpuClonerOptions option;

    option.allInGpu = true;



    faiss::IndexComposition index_composition;

    index_composition.index = cpu_index;

    index_composition.quantizer = nullptr;

    index_composition.mode = 1;



    double copy_time = elapsed();

    auto index = faiss::gpu::index_cpu_to_gpu(&res, 0, &index_composition, &option);

    delete index;



    if (pure_gpu_mode) {

        index_composition.mode = 2;  // 0: all data, 1: copy quantizer, 2: copy data

        index = faiss::gpu::index_cpu_to_gpu(&res, 0, &index_composition, &option);

    }



    copy_time = elapsed() - copy_time;

    printf("[%.3f s] Copy quantizer completed, cost %f s\n", elapsed() - t0, copy_time);



    size_t nq;

    float* xq;

    {
@@ -472,6 +452,36 @@ test_ivfsq8h(const std::string& ann_test_name, int32_t index_add_loops, const st 
        delete[] gt_int;

    }



    faiss::gpu::GpuClonerOptions option;

    option.allInGpu = true;



    faiss::IndexComposition index_composition;

    index_composition.index = cpu_index;

    index_composition.quantizer = nullptr;



    faiss::Index* index;

    double copy_time;



    if (!pure_gpu_mode) {

        index_composition.mode = 1;  // 0: all data, 1: copy quantizer, 2: copy data

        index = faiss::gpu::index_cpu_to_gpu(&res, 0, &index_composition, &option);

        delete index;



        copy_time = elapsed();

        index = faiss::gpu::index_cpu_to_gpu(&res, 0, &index_composition, &option);

        delete index;

    } else {

        index_composition.mode = 2;

        index = faiss::gpu::index_cpu_to_gpu(&res, 0, &index_composition, &option);

        delete index;



        copy_time = elapsed();

        index = faiss::gpu::index_cpu_to_gpu(&res, 0, &index_composition, &option);

    }



    copy_time = elapsed() - copy_time;

    printf("[%.3f s] Copy quantizer completed, cost %f s\n", elapsed() - t0, copy_time);



    const size_t NQ = 1000, K = 1000;

    if (!pure_gpu_mode) {

        for (auto nprobe : nprobes) {