mirror of
https://github.com/facebookresearch/faiss.git
synced 2026-10-12 02:13:36 +00:00
replace type(x) == y with isinstance(x, y) (#4542)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/4542 resolve: https://fburl.com/quality/vbqrtiu3 Reviewed By: junjieqi Differential Revision: D80682048 fbshipit-source-id: 1fb09e88921009355326c86998769580fd88bd9e
This commit is contained in:
committed by
Facebook GitHub Bot
parent
f361df8385
commit
daceaac99a
@@ -262,14 +262,14 @@ def plot_tradeoffs(db, allres, allstats, code_size, recall_rank):
|
||||
# times come after the perf measure
|
||||
times_idx = len(stat0["ranks"])
|
||||
|
||||
if type(code_size) == int:
|
||||
if isinstance(code_size, int):
|
||||
if code_size == 0:
|
||||
code_size = [0, 1e50]
|
||||
code_size_name = "any code size"
|
||||
else:
|
||||
code_size_name = "code_size=%d" % code_size
|
||||
code_size = [code_size, code_size]
|
||||
elif type(code_size) == tuple:
|
||||
elif isinstance(code_size, tuple):
|
||||
code_size_name = "code_size in [%d, %d]" % code_size
|
||||
else:
|
||||
assert False
|
||||
|
||||
@@ -33,7 +33,7 @@ def do_partition(n, qin, maxval=65536, seed=123, id_type='int64'):
|
||||
faiss.copy_array_to_AlignedTable(vals, tab_a)
|
||||
t0 = time.time()
|
||||
# print("tab a type", tab_a.get())
|
||||
if type(qin) == int:
|
||||
if isinstance(qin, int):
|
||||
q = qin
|
||||
faiss.CMax_uint16_partition_fuzzy(
|
||||
tab_a.get(), sp(ids), n, q, q, None)
|
||||
|
||||
@@ -199,10 +199,10 @@ class EvalIVFPQAccuracy(unittest.TestCase):
|
||||
# Validate the layout of the memory info
|
||||
mem_info = res.getMemoryInfo()
|
||||
|
||||
assert type(mem_info) == dict
|
||||
assert type(mem_info[0]['FlatData']) == tuple
|
||||
assert type(mem_info[0]['FlatData'][0]) == int
|
||||
assert type(mem_info[0]['FlatData'][1]) == int
|
||||
assert isinstance(mem_info, dict)
|
||||
assert isinstance(mem_info[0]['FlatData'], tuple)
|
||||
assert isinstance(mem_info[0]['FlatData'][0], int)
|
||||
assert isinstance(mem_info[0]['FlatData'][1], int)
|
||||
|
||||
gpu_index.nprobe = 4
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ class TestPartitioningFloat(unittest.TestCase, PartitionTests):
|
||||
vals_orig = vals.copy()
|
||||
|
||||
sp = faiss.swig_ptr
|
||||
if type(q) == int:
|
||||
if isinstance(q, int):
|
||||
faiss.CMax_float_partition_fuzzy(
|
||||
sp(vals), sp(ids), n,
|
||||
q, q, None
|
||||
@@ -110,7 +110,7 @@ class TestPartitioningFloatMin(unittest.TestCase, PartitionTests):
|
||||
vals[:] = mirval - vals
|
||||
|
||||
sp = faiss.swig_ptr
|
||||
if type(q) == int:
|
||||
if isinstance(q, int):
|
||||
faiss.CMin_float_partition_fuzzy(
|
||||
sp(vals), sp(ids), n,
|
||||
q, q, None
|
||||
@@ -157,7 +157,7 @@ class TestPartitioningUint16(unittest.TestCase, PartitionTests):
|
||||
tab_a = faiss.AlignedTableUint16()
|
||||
faiss.copy_array_to_AlignedTable(vals, tab_a)
|
||||
|
||||
if type(q) == int:
|
||||
if isinstance(q, int):
|
||||
faiss.CMax_uint16_partition_fuzzy(
|
||||
tab_a.get(), sp(ids), n, q, q, None)
|
||||
else:
|
||||
@@ -204,7 +204,7 @@ class TestPartitioningUint16Min(unittest.TestCase, PartitionTests):
|
||||
vals_inv = (65535 - vals).astype('uint16')
|
||||
faiss.copy_array_to_AlignedTable(vals_inv, tab_a)
|
||||
|
||||
if type(q) == int:
|
||||
if isinstance(q, int):
|
||||
faiss.CMin_uint16_partition_fuzzy(
|
||||
tab_a.get(), sp(ids), n, q, q, None)
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user