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.

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

[backport 2.x] Support filter and nested field in faiss engine radial search (#1652) and use default traversal ratio for lucene (#1619) #1658

Merged
merged 1 commit into from
Apr 29, 2024

Conversation

junqiu-lei
Copy link
Member

@junqiu-lei junqiu-lei commented Apr 26, 2024

Description

Backport #1652 and #1619 to 2.x branch.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…search-project#1652)

* Use 0.95 as default ratio for lucene radial search traversal similarity (opensearch-project#1619)

Signed-off-by: Junqiu Lei <[email protected]>
@junqiu-lei junqiu-lei changed the title [backport 2.x] Support filter and nested field in faiss engine radial search (#1652) [backport 2.x] Support filter and nested field in faiss engine radial search (#1652) and use default traversal ratio for lucene (#1619) Apr 26, 2024
@junqiu-lei
Copy link
Member Author

junqiu-lei commented Apr 29, 2024

The CI failure of Build and Test k-NN Plugin on MacOS (17) also happened in other PRs.

[  4%] Building CXX object external/faiss/faiss/CMakeFiles/faiss.dir/AutoTune.cpp.o
In file included from /Users/runner/work/k-NN/k-NN/jni/external/faiss/faiss/AutoTune.cpp:25:
In file included from /Users/runner/work/k-NN/k-NN/jni/external/faiss/faiss/IndexHNSW.h:17:
/Users/runner/work/k-NN/k-NN/jni/external/faiss/faiss/impl/HNSW.h:14:10: fatal error: 'omp.h' file not found
#include <omp.h>
         ^~~~~~~
1 error generated.
make[3]: *** [external/faiss/faiss/CMakeFiles/faiss.dir/AutoTune.cpp.o] Error 1
make[2]: *** [external/faiss/faiss/CMakeFiles/faiss.dir/all] Error 2
make[1]: *** [CMakeFiles/opensearchknn_faiss.dir/rule] Error 2
make: *** [opensearchknn_faiss] Error 2


> Task :buildJniLib FAILED
FAILURE: Build failed with an exception.

Created issue #1660

@junqiu-lei junqiu-lei merged commit 0366620 into opensearch-project:2.x Apr 29, 2024
84 of 87 checks passed
@junqiu-lei junqiu-lei deleted the faiss-radial-2.x branch April 29, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants