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

Bump faiss commit to 33c0ba5 #1796

Merged

Conversation

naveentatikonda
Copy link
Member

@naveentatikonda naveentatikonda commented Jul 5, 2024

Description

  • Bump faiss submodule commit to 33c0ba5 and update patches
  • Bump up cmake minimum required version to 3.24.0 to match with Faiss requirements.

Issues Resolved

#1659

Check List

  • All tests pass
  • 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.

heemin32
heemin32 previously approved these changes Jul 5, 2024
@heemin32
Copy link
Collaborator

heemin32 commented Jul 5, 2024

Can we add change log under maintenance?

@naveentatikonda naveentatikonda added Maintenance Add support for new versions of OpenSearch/Dashboards from upstream and removed skip-changelog labels Jul 5, 2024
heemin32
heemin32 previously approved these changes Jul 5, 2024
@navneet1v
Copy link
Collaborator

@naveentatikonda
Given the criticality of the change lets ensure all GH actions are successful before we can merge this commit.

cc: @vamshin , @jmazanec15

@naveentatikonda
Copy link
Member Author

@naveentatikonda Given the criticality of the change lets ensure all GH actions are successful before we can merge this commit.

cc: @vamshin , @jmazanec15

Sure once this fix(#1795 ) has been merged I will rebase my PR and merge only after all the CI checks are successful.

Signed-off-by: Naveen Tatikonda <[email protected]>
@naveentatikonda naveentatikonda force-pushed the bump_faiss_commit_sq8 branch from 9e68ea3 to 5c063a1 Compare July 6, 2024 23:38
@naveentatikonda
Copy link
Member Author

naveentatikonda commented Jul 8, 2024

Linux CI failing with CMake version error

CMake Error at external/faiss/CMakeLists.txt:21 (cmake_minimum_required):
CMake 3.24.0 or higher is required.  You are running version 3.23.3

Raised a PR to build repo to bump up CMake version to 3.26.4
opensearch-project/opensearch-build#4822

@peterzhuamazon
Copy link
Member

peterzhuamazon commented Jul 9, 2024

Image built and pushed to docker hub. You can try again with the test now.
Suggesting change the last commit to 3.26.4.

Thanks.

@naveentatikonda naveentatikonda requested a review from heemin32 July 10, 2024 19:51
@naveentatikonda naveentatikonda merged commit 8fb779d into opensearch-project:main Jul 10, 2024
50 of 52 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 10, 2024
* Bump faiss commit to 33c0ba5 and update patches

Signed-off-by: Naveen Tatikonda <[email protected]>

* Add Changelog

Signed-off-by: Naveen Tatikonda <[email protected]>

* Set cmake minimum requirement to 3.24.0

Signed-off-by: Naveen Tatikonda <[email protected]>

---------

Signed-off-by: Naveen Tatikonda <[email protected]>
(cherry picked from commit 8fb779d)
heemin32 pushed a commit that referenced this pull request Jul 16, 2024
* Bump faiss commit to 33c0ba5 and update patches

Signed-off-by: Naveen Tatikonda <[email protected]>

* Add Changelog

Signed-off-by: Naveen Tatikonda <[email protected]>

* Set cmake minimum requirement to 3.24.0

Signed-off-by: Naveen Tatikonda <[email protected]>

---------

Signed-off-by: Naveen Tatikonda <[email protected]>
(cherry picked from commit 8fb779d)

Co-authored-by: Naveen Tatikonda <[email protected]>
ryanbogan pushed a commit to ryanbogan/k-NN that referenced this pull request Jul 16, 2024
* Bump faiss commit to 33c0ba5 and update patches

Signed-off-by: Naveen Tatikonda <[email protected]>

* Add Changelog

Signed-off-by: Naveen Tatikonda <[email protected]>

* Set cmake minimum requirement to 3.24.0

Signed-off-by: Naveen Tatikonda <[email protected]>

---------

Signed-off-by: Naveen Tatikonda <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Maintenance Add support for new versions of OpenSearch/Dashboards from upstream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants