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

[Feature to main] Add binary format support with IVF method in Faiss Engine (#1784) #1862

Merged
merged 1 commit into from
Jul 22, 2024

Conversation

junqiu-lei
Copy link
Member

@junqiu-lei junqiu-lei commented Jul 22, 2024

Description

This PR adds #1784 to main branch. It also removes temporary api block code from Heemin's last PR at IndexUtil.java and IndexUtilTests.java.

Related Issues

#1767

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

@junqiu-lei junqiu-lei added Features Introduces a new unit of functionality that satisfies a requirement backport 2.x v2.16.0 backport 2.16 labels Jul 22, 2024
@junqiu-lei junqiu-lei self-assigned this Jul 22, 2024
@junqiu-lei
Copy link
Member Author

junqiu-lei commented Jul 22, 2024

Since the auto backport will be failed, created PR #1863 and #1864 for 2.x and 2.16 branch backport in advance.

@junqiu-lei junqiu-lei merged commit f292124 into opensearch-project:main Jul 22, 2024
51 of 52 checks passed
@junqiu-lei junqiu-lei deleted the ivf-binary-main branch July 22, 2024 19:38
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1862-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f2921249c01f6959621b8cf6300e2356c26f36b7
# Push it to GitHub
git push --set-upstream origin backport/backport-1862-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1862-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.16 2.16
# Navigate to the new working tree
cd .worktrees/backport-2.16
# Create a new branch
git switch --create backport/backport-1862-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f2921249c01f6959621b8cf6300e2356c26f36b7
# Push it to GitHub
git push --set-upstream origin backport/backport-1862-to-2.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.16

Then, create a pull request where the base branch is 2.16 and the compare/head branch is backport/backport-1862-to-2.16.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport 2.16 Features Introduces a new unit of functionality that satisfies a requirement v2.16.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants