Backport/backport 2397 to 2.x #2409
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sam-herman
requested review from
heemin32,
navneet1v,
VijayanB,
vamshin,
jmazanec15,
naveentatikonda,
junqiu-lei,
martin-gaievski,
ryanbogan,
luyuncheng,
shatejas and
0ctopus13prime
as code owners
Merged
|
@sam-herman this doesn't seem correct to me. Can you please rebase your code and raise the PR again. |
* fix paths for libomp on newer homebrew versions auto load java home path on macos update to latest nmslib revision Signed-off-by: Samuel Herman <[email protected]>
sam-herman
force-pushed
the
backport/backport-2397-to-2.x
branch
from
9cd8b6f to
fc14d3c
Compare
yeah, DCO was messed up. hopefully it should be fixed now. |
navneet1v
previously approved these changes
Jan 23, 2025
|
@sam-herman seems like conflicts with CHANGELog file. Please fix it |
Signed-off-by: sam-herman <[email protected]>
done. |
navneet1v
approved these changes
Jan 24, 2025
|
@jmazanec15 @vamshin can one of you approve as well? I need 2 approvals for merge. |
jmazanec15
approved these changes
Jan 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Backport of #2397
This change fixes the build issues for the C++ portion of the codebase on MacOSX for both nmslib by upgrading to the latest version and for faiss by setting the correct flags and using the right dependencies and directory paths
Ideally with this fix we will not need to ask developers to manually run text replacement commands like there are currently in the DEVELOPER.md file
Check List
--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.