merge in conflicting changes from erikbern/ann-benchmarks

Author: Jeadie

README.md

@@ -40,7 +40,7 @@ Evaluated
 * [vald](https://github.com/vdaas/vald) ![https://img.shields.io/github/stars/vdaas/vald?style=social](https://img.shields.io/github/stars/vdaas/vald?style=social)
 * [Qdrant](https://github.com/qdrant/qdrant) ![https://img.shields.io/github/stars/qdrant/qdrant?style=social](https://img.shields.io/github/stars/qdrant/qdrant?style=social)
 * [qsgngtlib](https://gitee.com/WPJIANG-gitee/hwtl_sdu-anns-qsgngtlib)
-* [Milvus](https://github.com/milvus-io/milvus) ![https://img.shields.io/github/stars/milvus-io/milvus?style=social](https://img.shields.io/github/stars/milvus-io/milvus?style=social): [Knowhere](https://github.com/milvus-io/knowhere) [Glass](https://github.com/hhy3/pyglass) 
+* [Milvus](https://github.com/milvus-io/milvus) ![https://img.shields.io/github/stars/milvus-io/milvus?style=social](https://img.shields.io/github/stars/milvus-io/milvus?style=social): [Knowhere](https://github.com/milvus-io/knowhere) * [Zilliz(Glass)](https://github.com/hhy3/pyglass) 
 * [pgvector](https://github.com/pgvector/pgvector) ![https://img.shields.io/github/stars/pgvector/pgvector?style=social](https://img.shields.io/github/stars/pgvector/pgvector?style=social)
 
 Data sets

ann_benchmarks/algorithms/elasticsearch/module.py

@@ -123,4 +123,4 @@ def get_batch_results(self):
         return self.batch_res
 
     def __str__(self):
-        return f"Elasticsearch(index_options: {self.index_options}, num_canditates: {self.num_candidates})"
+        return f"Elasticsearch(index_options: {self.index_options}, num_canditates: {self.num_candidates})"

ann_benchmarks/algorithms/glass/Dockerfile

@@ -1,4 +1,5 @@
 FROM ann-benchmarks
 
-RUN pip3 install glassppy==1.0.5
-RUN python3 -c 'import glassppy as glass'
+RUN lscpu
+RUN pip3 install glassppy
+RUN python3 -c 'import glassppy as glass'

ann_benchmarks/algorithms/opensearchknn/module.py

@@ -107,4 +107,4 @@ def freeIndex(self):
         self.client.indices.delete(index=self.index_name)
 
     def __str__(self):
-        return f"OpenSearch(index_options: {self.method_param}, ef_search: {self.ef_search})"
+        return f"OpenSearch(index_options: {self.method_param}, ef_search: {self.ef_search})"