Fix build failure due to patch conflict #1851
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
heemin32
requested review from
navneet1v,
VijayanB,
vamshin,
jmazanec15,
naveentatikonda,
junqiu-lei,
martin-gaievski,
ryanbogan and
luyuncheng
as code owners
|
BWC test is failing because OS distribution does not have knn 2.16 which will be fixed once this PR is merged. |
ryanbogan
previously approved these changes
Jul 18, 2024
jmazanec15
reviewed
Jul 18, 2024
| } | ||
| else { | ||
| commandLine 'cmake', '.', "-DKNN_PLUGIN_VERSION=${opensearch_version}", "-DSIMD_ENABLED=${simd_enabled}", "-DCOMMIT_LIB_PATCHES=${commit_lib_patches}" | ||
| args.add("-G") |
There was a problem hiding this comment.
Oops. Let me check one more time.
There was a problem hiding this comment.
It seems the order of -G option doesn't matter. I put it at the end and it works.
| list(APPEND PATCH_FILE_LIST "${CMAKE_CURRENT_SOURCE_DIR}/patches/faiss/0002-Enable-precomp-table-to-be-shared-ivfpq.patch") | ||
| list(APPEND PATCH_FILE_LIST "${CMAKE_CURRENT_SOURCE_DIR}/patches/faiss/0003-Custom-patch-to-support-range-search-params.patch") | ||
| list(APPEND PATCH_FILE_LIST "${CMAKE_CURRENT_SOURCE_DIR}/patches/faiss/0004-Custom-patch-to-support-binary-vector.patch") | ||
| if(NOT DEFINED APPLY_LIB_PATCHES OR "${APPLY_LIB_PATCHES}" STREQUAL true) |
There was a problem hiding this comment.
Can we just skip everything for patches?
Signed-off-by: Heemin Kim <[email protected]>
| commandLine 'cmake', '.', "-G", "Unix Makefiles", "-DKNN_PLUGIN_VERSION=${opensearch_version}", "-DBLAS_LIBRARIES=$rootDir\\src\\main\\resources\\windowsDependencies\\libopenblas.dll", "-DLAPACK_LIBRARIES=$rootDir\\src\\main\\resources\\windowsDependencies\\libopenblas.dll", "-DSIMD_ENABLED=${simd_enabled}", "-DCOMMIT_LIB_PATCHES=${commit_lib_patches}" | ||
| } | ||
| else { | ||
| commandLine 'cmake', '.', "-DKNN_PLUGIN_VERSION=${opensearch_version}", "-DSIMD_ENABLED=${simd_enabled}", "-DCOMMIT_LIB_PATCHES=${commit_lib_patches}" |
There was a problem hiding this comment.
did we skip -DKNN_PLUGIN_VERSION=${opensearch_version} intentionally?
74 tasks
martin-gaievski
approved these changes
Jul 18, 2024
ryanbogan
approved these changes
Jul 18, 2024
jmazanec15
approved these changes
Jul 18, 2024
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jul 18, 2024
Signed-off-by: Heemin Kim <[email protected]> (cherry picked from commit 881364f)
heemin32
added a commit
that referenced
this pull request
Jul 18, 2024
Signed-off-by: Heemin Kim <[email protected]> (cherry picked from commit 881364f) Co-authored-by: Heemin Kim <[email protected]>
naveentatikonda
pushed a commit
to naveentatikonda/k-NN
that referenced
this pull request
Jul 20, 2024
…ensearch-project#1852) Signed-off-by: Heemin Kim <[email protected]> (cherry picked from commit 881364f) Co-authored-by: Heemin Kim <[email protected]>
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
This PR is a continuation of #1833 to fix build failure when patch is applied more than once.
The previous PR resolved an issue for manual build where it uses
git amand the Cmake system skips applying patches by comparing patch id. However the build script which runs in CI build system still fails because it usesgit applywhich does not commit the patch and we cannot use patch-id to determine if patches are already applied or not.Therefore introduced a new parameter,
build.lib.apply_patchesto disable patching for the second run of :cmakeJniLib task inside build script.The alternative is making the build script to use
git amby setting git user.name and user.email. This approach will provide more control when setting user.name and user.email is not desirable.Related Issues
#1842
Part of opensearch-project/opensearch-build#4771
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.