diff --git a/benchs/bench_all_ivf/parse_bench_all_ivf.py b/benchs/bench_all_ivf/parse_bench_all_ivf.py index 52d59c910..6df517f97 100644 --- a/benchs/bench_all_ivf/parse_bench_all_ivf.py +++ b/benchs/bench_all_ivf/parse_bench_all_ivf.py @@ -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 diff --git a/benchs/bench_partition.py b/benchs/bench_partition.py index 85c912e07..3b8748c29 100644 --- a/benchs/bench_partition.py +++ b/benchs/bench_partition.py @@ -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) diff --git a/faiss/gpu/test/test_multi_gpu.py b/faiss/gpu/test/test_multi_gpu.py index 6ec2079ff..4b74ee759 100644 --- a/faiss/gpu/test/test_multi_gpu.py +++ b/faiss/gpu/test/test_multi_gpu.py @@ -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 diff --git a/tests/test_partition.py b/tests/test_partition.py index 70bfd76f5..d920cf91c 100644 --- a/tests/test_partition.py +++ b/tests/test_partition.py @@ -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: