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

Update build.gradle and build.sh to separate x64 linux nmslib build with different gcc versions #2506

Merged

Conversation

peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Feb 7, 2025

Description

Update build.gradle and build.sh to separate x64 linux nmslib build with different gcc versions

Related Issues

Closes #2484

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.

Sorry, something went wrong.

Verified

This commit was signed with the committer’s verified signature.
peterzhuamazon Peter Zhu
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Verified

This commit was signed with the committer’s verified signature.
peterzhuamazon Peter Zhu
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Verified

This commit was signed with the committer’s verified signature.
peterzhuamazon Peter Zhu
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Verified

This commit was signed with the committer’s verified signature.
peterzhuamazon Peter Zhu
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Verified

This commit was signed with the committer’s verified signature.
peterzhuamazon Peter Zhu
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
naveentatikonda
naveentatikonda previously approved these changes Feb 7, 2025

Verified

This commit was signed with the committer’s verified signature.
peterzhuamazon Peter Zhu
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Verified

This commit was signed with the committer’s verified signature.
peterzhuamazon Peter Zhu
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member Author

@peterzhuamazon
Copy link
Member Author

@peterzhuamazon peterzhuamazon merged commit 107c4f1 into opensearch-project:2.19 Feb 7, 2025
99 checks passed
@peterzhuamazon peterzhuamazon deleted the knn-nmslib-separation-2 branch February 7, 2025 06:10
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 7, 2025
…ith different gcc versions (#2506)

* Update build gradle to separate nmslib / faiss generation

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Update scripts/build.sh to separate enable gcc switch

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating restart and rolling upgrade bwc test bundle.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enforce gcc10 for nmslib to compile and avx512_spr have no-op

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 107c4f1)
navneet1v pushed a commit that referenced this pull request Feb 7, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…ith different gcc versions (#2506) (#2508)

* Update build gradle to separate nmslib / faiss generation

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Update scripts/build.sh to separate enable gcc switch

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating restart and rolling upgrade bwc test bundle.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enforce gcc10 for nmslib to compile and avx512_spr have no-op

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 107c4f1)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member Author

Based on the information that nmslib will be deprecated in 3.x, we do not need to port this to main.

Thanks.

@navneet1v
Copy link
Collaborator

Based on the information that nmslib will be deprecated in 3.x, we do not need to port this to main.

Thanks.

@peterzhuamazon just to provide some clarity we are deprecating nmslib in 3.0 but the support will still be there. Hence we should backport this change to 3.x too

opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 10, 2025
…ith different gcc versions (#2506)

* Update build gradle to separate nmslib / faiss generation

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Update scripts/build.sh to separate enable gcc switch

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating restart and rolling upgrade bwc test bundle.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enforce gcc10 for nmslib to compile and avx512_spr have no-op

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 107c4f1)
VijayanB pushed a commit to VijayanB/k-NN-2 that referenced this pull request Feb 10, 2025
…ith different gcc versions (opensearch-project#2506)

* Update build gradle to separate nmslib / faiss generation

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Update scripts/build.sh to separate enable gcc switch

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating restart and rolling upgrade bwc test bundle.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enforce gcc10 for nmslib to compile and avx512_spr have no-op

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
VijayanB pushed a commit to VijayanB/k-NN-2 that referenced this pull request Feb 10, 2025
…ith different gcc versions (opensearch-project#2506) (opensearch-project#2508)

* Update build gradle to separate nmslib / faiss generation

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Update scripts/build.sh to separate enable gcc switch

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating restart and rolling upgrade bwc test bundle.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enforce gcc10 for nmslib to compile and avx512_spr have no-op

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 107c4f1)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
VijayanB added a commit that referenced this pull request Feb 10, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
* Update package name to fix compilation issue

Core renamed this package in opensearch-project/OpenSearch#17272
This commit renames package accordingly

Signed-off-by: Balasubramanian <balasvij@amazon.com>

* Update build.gradle and build.sh to separate x64 linux nmslib build with different gcc versions (#2506) (#2508)

* Update build gradle to separate nmslib / faiss generation

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Update scripts/build.sh to separate enable gcc switch

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating restart and rolling upgrade bwc test bundle.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enforce gcc10 for nmslib to compile and avx512_spr have no-op

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 107c4f1)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Balasubramanian <balasvij@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Vikasht34 pushed a commit to Vikasht34/k-NN that referenced this pull request Feb 12, 2025
* Update package name to fix compilation issue

Core renamed this package in opensearch-project/OpenSearch#17272
This commit renames package accordingly

Signed-off-by: Balasubramanian <balasvij@amazon.com>

* Update build.gradle and build.sh to separate x64 linux nmslib build with different gcc versions (opensearch-project#2506) (opensearch-project#2508)

* Update build gradle to separate nmslib / faiss generation

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Update scripts/build.sh to separate enable gcc switch

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating restart and rolling upgrade bwc test bundle.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enforce gcc10 for nmslib to compile and avx512_spr have no-op

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 107c4f1)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Balasubramanian <balasvij@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
navneet1v pushed a commit that referenced this pull request Feb 17, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…vice (#2532)

* fix broken build flag, move build to one directory (#2442)

* move build to one directory, fix broken flag

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* fix make path

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* changelog update

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* add fix for classpath change and for cmake discovery on macos

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* fix make discovery for gradle

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* fix cmake path for macOS

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

---------

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* Update package name to fix compilation issue (#2513)

* Update package name to fix compilation issue

Core renamed this package in opensearch-project/OpenSearch#17272
This commit renames package accordingly

Signed-off-by: Balasubramanian <balasvij@amazon.com>

* Update build.gradle and build.sh to separate x64 linux nmslib build with different gcc versions (#2506) (#2508)

* Update build gradle to separate nmslib / faiss generation

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Update scripts/build.sh to separate enable gcc switch

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove test comments

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating restart and rolling upgrade bwc test bundle.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enforce gcc10 for nmslib to compile and avx512_spr have no-op

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 107c4f1)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Balasubramanian <balasvij@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

* Adds debug logs for KNNQuery and KNNWeight (#2466) (#2470)

* Adds debug logs for KNNQuery and KNNWeight

Signed-off-by: Tejas Shah <shatejas@amazon.com>

* Adds check to see if log is enabled to start and stop StopWatch

Signed-off-by: Tejas Shah <shatejas@amazon.com>

* Addressing comments on the PR

Signed-off-by: Tejas Shah <shatejas@amazon.com>

* Adds shard and segment info in the logs

Signed-off-by: Tejas Shah <shatejas@amazon.com>

* Removes unnecessary segment name param from exact search

Signed-off-by: Tejas Shah <shatejas@amazon.com>

* Fixes the build

Signed-off-by: Tejas Shah <shatejas@amazon.com>

---------

Signed-off-by: Tejas Shah <shatejas@amazon.com>
(cherry picked from commit f322e27)

Co-authored-by: Tejas Shah <shatejas@amazon.com>

* Clean JNI artifacts with ./gradlew clean (#2516)

* clean JNI artifacts with ./gradlew clean

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* nest release under build directory

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* adjust all references to the old release path

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* remove irrelevant paths from gitignore, add jni/build

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* fix logging on linux

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

---------

Signed-off-by: Samuel Herman <sherman8915@gmail.com>

* Backport to main (#2520)

* Remove skip building graph check for quantization use case (#2430)

For quantization indices, we don't have to apply building graph check
since it is already faster, this is now only applied for fp32/16 indices
and where threshold is configured.

Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>

* Update default to 0 to always build graph as default behavior (#2452)

Signed-off-by: Balasubramanian <balasvij@amazon.com>

* Update changelog

Signed-off-by: Balasubramanian <balasvij@amazon.com>

---------

Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
Signed-off-by: Balasubramanian <balasvij@amazon.com>

* [Backport main] Add release notes for 2.19.0 (#2503)

* Add release notes for 2.19.0

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>

* Fix links for release notes

Co-authored-by: John Mazanec <jmazane@amazon.com>
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>

---------

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
Co-authored-by: John Mazanec <jmazane@amazon.com>

* Fix main knnlib dir in build script based on #2442 (#2526)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Minor performance improvments in KNNQueryBuilder (#2528)

Signed-off-by: Tejas Shah <shatejas@amazon.com>

* Initial implementation of control flow

Signed-off-by: Rohan Chitale <r.chitale7@gmail.com>

---------

Signed-off-by: Samuel Herman <sherman8915@gmail.com>
Signed-off-by: Balasubramanian <balasvij@amazon.com>
Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Tejas Shah <shatejas@amazon.com>
Signed-off-by: Rohan Chitale <r.chitale7@gmail.com>
Co-authored-by: sam-herman <97131656+sam-herman@users.noreply.github.com>
Co-authored-by: Vijayan Balasubramanian <balasvij@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Tejas Shah <shatejas@amazon.com>
Co-authored-by: Kunal Kotwani <kkotwani@amazon.com>
Co-authored-by: John Mazanec <jmazane@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ✅ Done
4 participants