Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REVIEW] ANN warnings/tests updates #4101

Merged
merged 2 commits into from
Jul 28, 2021
Merged

[REVIEW] ANN warnings/tests updates #4101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e1c57c
ANN warning update
viclafargue Jul 26, 2021
b892937
Update testing
viclafargue Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions python/cuml/neighbors/nearest_neighbors.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,10 @@ class NearestNeighbors(Base,
Notes
-----
Warning: IVFPQ might be unstable in this version of cuML.
This is due to a known issue in the FAISS release that this
cuML version is linked to. (see FAISS issue #1421)
Warning: Approximate Nearest Neighbor methods might be unstable
in this version of cuML. This is due to a known issue in
the FAISS release that this cuML version is linked to.
(see cuML issue #4020)
For an additional example see `the NearestNeighbors notebook
<https://github.com/rapidsai/cuml/blob/branch-0.15/notebooks/nearest_neighbors_demo.ipynb>`_.
Expand Down Expand Up @@ -349,11 +350,11 @@ class NearestNeighbors(Base,
cdef handle_t* handle_ = <handle_t*><uintptr_t> self.handle.getHandle()
cdef knnIndexParam* algo_params = <knnIndexParam*> 0
if self.algorithm in ['ivfflat', 'ivfpq', 'ivfsq']:
if self.algorithm == 'ivfpq':
warnings.warn("\nWarning: IVFPQ might be unstable in this "
"version of cuML. This is due to a known issue "
"in the FAISS release that this cuML version "
"is linked to. (see FAISS issue #1421)")
warnings.warn("\nWarning: Approximate Nearest Neighbor methods "
"might be unstable in this version of cuML. "
"This is due to a known issue in the FAISS "
"release that this cuML version is linked to. "
"(see cuML issue #4020)")

if not is_dense(X):
raise ValueError("Approximate Nearest Neigbors methods "
Expand Down
14 changes: 1 addition & 13 deletions python/cuml/test/test_nearest_neighbors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,6 @@ def test_self_neighboring(datatype, metric_p, nrows):
("ivfsq", "numpy")])
def test_neighborhood_predictions(nrows, ncols, n_neighbors, n_clusters,
datatype, algo):
if algo == "ivfpq":
pytest.xfail("Warning: IVFPQ might be unstable in this "
"version of cuML. This is due to a known issue "
"in the FAISS release that this cuML version "
"is linked to. (see FAISS issue #1421)")

if not has_scipy():
pytest.skip('Skipping test_neighborhood_predictions because ' +
'Scipy is missing')
Expand Down Expand Up @@ -222,19 +216,13 @@ def test_ivfflat_pred(nrows, ncols, n_neighbors, nlist):

@pytest.mark.parametrize("nlist", [8])
@pytest.mark.parametrize("M", [16, 32])
@pytest.mark.parametrize("n_bits", [2, 4])
@pytest.mark.parametrize("n_bits", [4, 6])
@pytest.mark.parametrize("usePrecomputedTables", [False, True])
@pytest.mark.parametrize("nrows", [4000])
@pytest.mark.parametrize("ncols", [128, 512])
@pytest.mark.parametrize("n_neighbors", [8])
def test_ivfpq_pred(nrows, ncols, n_neighbors,
nlist, M, n_bits, usePrecomputedTables):

pytest.xfail("Warning: IVFPQ might be unstable in this "
"version of cuML. This is due to a known issue "
"in the FAISS release that this cuML version "
"is linked to. (see FAISS issue #1421)")

algo_params = {
'nlist': nlist,
'nprobe': int(nlist * 0.2),
Expand Down