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

Merge pull request #686 from milvus-io/0.6.0 

Merge from 0.6.0
parents 18448121 e6c00af0

.all-contributorsrc

+9 −0
Original line number Diff line number Diff line
@@ -5,6 +5,15 @@ 
  "imageSize": 100,

  "commit": false,

  "contributors": [

    {

      "login": "gaolizhou",

      "name": "gaolizhou",

      "avatar_url": "https://avatars2.githubusercontent.com/u/2884044?v=4",

      "profile": "https://github.com/gaolizhou",

      "contributions": [

        "code"

      ]

    },

    {

      "login": "akihoni",

      "name": "Sijie Zhang",

README.md

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ Below is a list of Milvus contributors. We greatly appreciate your contributions 
<!-- markdownlint-disable -->

<table>

  <tr>

    <td align="center"><a href="https://github.com/gaolizhou"><img src="https://avatars2.githubusercontent.com/u/2884044?v=4" width="100px;" alt="gaolizhou"/><br /><sub><b>gaolizhou</b></sub></a><br /><a href="https://github.com/milvus-io/milvus/commits?author=gaolizhou" title="Code">💻</a></td>

    <td align="center"><a href="https://github.com/akihoni"><img src="https://avatars0.githubusercontent.com/u/36330442?v=4" width="100px;" alt="Sijie Zhang"/><br /><sub><b>Sijie Zhang</b></sub></a><br /><a href="https://github.com/milvus-io/milvus/commits?author=akihoni" title="Documentation">📖</a></td>

  </tr>

</table>

tests/milvus_ann_acc/client.py

+4 −2
Original line number Diff line number Diff line
@@ -88,8 +88,10 @@ class MilvusClient(object): 
            index_type = IndexType.IVF_SQ8

        elif index_type == "ivf_sq8h":

            index_type = IndexType.IVF_SQ8H

        elif index_type == "mix_nsg":

            index_type = IndexType.MIX_NSG

        elif index_type == "nsg":

            index_type = IndexType.NSG

        elif index_type == "ivf_pq":

            index_type = IndexType.IVF_PQ

        index_params = {

            "index_type": index_type,

            "nlist": nlist,

tests/milvus_ann_acc/requirements.txt

+3 −3
Original line number Diff line number Diff line 
numpy==1.16.3

pymilvus>=0.2.0

pymilvus-test>=0.2.0

scikit-learn==0.19.1

h5py==2.7.1

influxdb==5.2.2

pyyaml==3.12

pyyaml>=5.1

tableprint==0.8.0

ansicolors==1.1.8

scipy==1.3.1

tests/milvus_ann_acc/runner.py

+3 −3
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ def recall_calc(result_ids, true_ids, top_k, recall_k): 
    sum_intersect_num = 0

    recall = 0.0

    for index, result_item in enumerate(result_ids):

        if len(set(true_ids[index][:top_k])) != len(set(result_item)):

            logger.warning("Error happened: query result length is wrong")

            continue

        # if len(set(true_ids[index][:top_k])) != len(set(result_item)):

        #     logger.warning("Error happened: query result length is wrong")

        #     continue

        tmp = set(true_ids[index][:recall_k]).intersection(set(result_item))

        sum_intersect_num = sum_intersect_num + len(tmp)

    recall = round(sum_intersect_num / (len(result_ids) * recall_k), 4)