milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update numpy bool type (#21642) 

Signed-off-by: nico <cheng.yuan@zilliz.com>
pull/21656/head
NicoYuan1986 2023-01-11 19:13:39 +08:00 committed by GitHub
parent 8c2c04517e
commit 39ed627e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/python_client/common/common_func.py
View File

@ -605,20 +605,20 @@ def ip(x, y):
def jaccard(x, y):
x = np.asarray(x, np.bool)
y = np.asarray(y, np.bool)
x = np.asarray(x, np.bool_)
y = np.asarray(y, np.bool_)
return 1 - np.double(np.bitwise_and(x, y).sum()) / np.double(np.bitwise_or(x, y).sum())
def hamming(x, y):
x = np.asarray(x, np.bool)
y = np.asarray(y, np.bool)
x = np.asarray(x, np.bool_)
y = np.asarray(y, np.bool_)
return np.bitwise_xor(x, y).sum()
def tanimoto(x, y):
x = np.asarray(x, np.bool)
y = np.asarray(y, np.bool)
x = np.asarray(x, np.bool_)
y = np.asarray(y, np.bool_)
res = np.double(np.bitwise_and(x, y).sum()) / np.double(np.bitwise_or(x, y).sum())
if res == 0:
value = 0
@ -628,20 +628,20 @@ def tanimoto(x, y):
def tanimoto_calc(x, y):
x = np.asarray(x, np.bool)
y = np.asarray(y, np.bool)
x = np.asarray(x, np.bool_)
y = np.asarray(y, np.bool_)
return np.double((len(x) - np.bitwise_xor(x, y).sum())) / (len(y) + np.bitwise_xor(x, y).sum())
def substructure(x, y):
x = np.asarray(x, np.bool)
y = np.asarray(y, np.bool)
x = np.asarray(x, np.bool_)
y = np.asarray(y, np.bool_)
return 1 - np.double(np.bitwise_and(x, y).sum()) / np.count_nonzero(y)
def superstructure(x, y):
x = np.asarray(x, np.bool)
y = np.asarray(y, np.bool)
x = np.asarray(x, np.bool_)
y = np.asarray(y, np.bool_)
return 1 - np.double(np.bitwise_and(x, y).sum()) / np.count_nonzero(x)

1
tests/python_client/testcases/test_search.py
View File

@ -1918,7 +1918,6 @@ class TestCollectionSearch(TestcaseBase):
assert abs(res[0].distances[0] - min(distance_0, distance_1)) <= epsilon
@pytest.mark.tags(CaseLabel.L2)
@pytest.mark.xfail(reason="issue 6843")
@pytest.mark.parametrize("index", ["BIN_FLAT", "BIN_IVF_FLAT"])
def test_search_binary_tanimoto_flat_index(self, nq, dim, auto_id, _async, index, is_flush):
"""