Unverified Commit 0bac06a5 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #1589 from tinkerlin/fix_1517 

fix 1517
parents 8f127498 ff0aad81

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ Please mark all change in change log and use the issue from GitHub 
-   \#990 Check gpu resources setting when assign repeated value

-   \#995 Table count set to 0 if no tables found

-   \#1010 Improve error message when offset or page_size is equal 0

-   \#1022 Check if partition name is valid

-   \#1028 check if table exists when show partitions

-   \#1029 check if table exists when try to delete partition

-   \#1066 optimize http insert and search speed

-   \#1022 Check if partition name is legal

-   \#1028 Check if table exists when show partitions

-   \#1029 Check if table exists when try to delete partition
@@ -36,6 +40,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#1507 set_config for insert_buffer_size is wrong

-   \#1510 Add set interfaces for WAL configurations

-   \#1511 Fix big integer cannot pass to server correctly

-   \#1517 result is not correct when search vectors in multi partition, index type is RNSG 

-   \#1518 Table count did not match after deleting vectors and compact

-   \#1521 Make cache_insert_data take effect in-service

-   \#1525 Add setter API for config preload_table

core/src/index/knowhere/knowhere/index/vector_index/nsg/NSG.cpp

+1 −15
Original line number Diff line number Diff line
@@ -698,13 +698,8 @@ NsgIndex::Search(const float* query, const unsigned& nq, const unsigned& dim, co 
                 int64_t* ids, SearchParams& params) {

    std::vector<std::vector<Neighbor>> resset(nq);



    if (k >= 45) {

        params.search_length = k;

    }



    TimeRecorder rc("NsgIndex::search", 1);

    // TODO(linxj): when to use openmp

    if (nq <= 4) {

    if (nq == 1) {

        GetNeighbors(query, resset[0], nsg, &params);

    } else {

#pragma omp parallel for
@@ -733,15 +728,6 @@ NsgIndex::Search(const float* query, const unsigned& nq, const unsigned& dim, co 
        }

    }

    rc.RecordSection("merge");



    // ProfilerStart("xx.prof");

    // std::vector<Neighbor> resset;

    // GetNeighbors(query, resset, nsg, &params);

    // for (int i = 0; i < k; ++i) {

    //    ids[i] = resset[i].id;

    // dist[i] = resset[i].distance;

    //}

    // ProfilerStop();

}



void

core/src/index/unittest/test_nsg/test_nsg.cpp

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ TEST_F(NSGInterfaceTest, comparetest) { 
//            }

//        }

//    }

//    printf("R@1 = %.4f\n", n_1 / float(nq));

//    printf("R@1 = %.4f\n", n_1 / float(nq));;

//    printf("R@10 = %.4f\n", n_10 / float(nq));

//    printf("R@100 = %.4f\n", n_100 / float(nq));

//}

core/src/wrapper/ConfAdapter.cpp

+3 −1
Original line number Diff line number Diff line
@@ -225,7 +225,9 @@ NSGConfAdapter::CheckTrain(milvus::json& oricfg) { 


    // auto tune params

    oricfg[knowhere::IndexParams::nlist] = MatchNlist(oricfg[knowhere::meta::ROWS].get<int64_t>(), 8192, 8192);

    oricfg[knowhere::IndexParams::nprobe] = int(oricfg[knowhere::IndexParams::nlist].get<int64_t>() * 0.01);



    int64_t nprobe = int(oricfg[knowhere::IndexParams::nlist].get<int64_t>() * 0.1);

    oricfg[knowhere::IndexParams::nprobe] = nprobe < 1 ? 1 : nprobe;



    return true;

}