Update gradle to 8.13 to fix command exec on java 21 #2571
Merged
+42
−102
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
Updates gradle version to fix command execution for java 21. With that, it simplifies overall gradle script and not having to locate dependencies. The environment is inherited from the path. Signed-off-by: John Mazanec <jmazane@amazon.com>
navneet1v
reviewed
Mar 3, 2025
build.gradle
Outdated
Comment on lines
414
to
427
| task buildNmslib(type:Exec) { | ||
| dependsOn cmakeJniLib | ||
| def cmakePath = findExecutable("cmake") | ||
| logger.lifecycle("Using cmake at: ${cmakePath}") | ||
|
|
||
| if (cmakePath.isEmpty()) { | ||
| throw new GradleException("CMake not found in PATH. Please install CMake.") | ||
| } | ||
|
|
||
| commandLine cmakePath, | ||
| '--build', 'jni/build', | ||
| '--target', 'opensearchknn_nmslib', | ||
| '--parallel', "${nproc_count}" | ||
| } |
There was a problem hiding this comment.
@jmazanec15 any reason for removing this? I remember @peterzhuamazon added this to ensure that release builds are not failing. Would like to know why we are removing it.
There was a problem hiding this comment.
Oh I see. Let me fix. I just thought it was duplicate code.
There was a problem hiding this comment.
Yes we add this specifically to build nmslib with different gccs compares to faiss lib.
cc: @naveentatikonda
Thanks.
shatejas
reviewed
Mar 3, 2025
| @@ -1,12 +1,7 @@ | |||
| # | |||
There was a problem hiding this comment.
nit : why was this removed
There was a problem hiding this comment.
no reason - let me put back
Signed-off-by: John Mazanec <jmazane@amazon.com>
navneet1v
previously approved these changes
Mar 3, 2025
Signed-off-by: John Mazanec <jmazane@amazon.com>
naveentatikonda
approved these changes
Mar 3, 2025
shatejas
approved these changes
Mar 3, 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
Updates gradle version to fix command execution for java 21. With that, it simplifies overall gradle script and not having to locate dependencies. The environment is inherited from the path.
When setting up the project with jdk 21, the "cmake" command is not being found in the path. This is a bug in gradle and has been fixed. With this, we can remove some of the additional code.
Related Issues
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.