Clean JNI artifacts with ./gradlew clean #2516
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -373,8 +373,8 @@ tasks.register('cmakeJniLib', Exec) { | |
|
|
||
| def args = [] | ||
| args.add(cmakePath) | ||
| args.add("-S jni") // CMakelists.txt directory | ||
| args.add("-B jni/build") // Build directory | ||
| args.add("-DKNN_PLUGIN_VERSION=${opensearch_version}") | ||
| args.add("-DAVX2_ENABLED=${avx2_enabled}") | ||
| args.add("-DAVX512_ENABLED=${avx512_enabled}") | ||
|
|
@@ -405,44 +405,52 @@ tasks.register('cmakeJniLib', Exec) { | |
| standardOutput = outputStream | ||
| } | ||
|
|
||
| // Makes sure that `./gradlew clean` removes all JNI build artifacts | ||
| tasks.clean.doFirst { | ||
|
Collaborator
There was a problem hiding this comment. can we not just remove build folder here, since with your earlier change you moved all these files to the
Contributor
Author
There was a problem hiding this comment. I think
Contributor
Author
There was a problem hiding this comment. But you're right, the rest are not needed other than
Contributor
Author
There was a problem hiding this comment. @navneet1v should be good now on the paths, let me know. |
||
| // Delete JNI build directory | ||
| delete "${projectDir}/jni/build" | ||
| } | ||
|
|
||
| task buildNmslib(type:Exec) { | ||
| dependsOn cmakeJniLib | ||
| def cmakePath = findExecutable("cmake") | ||
| logger.lifecycle("Using cmake at: ${cmakePath}") | ||
navneet1v marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| 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}" | ||
| } | ||
|
|
||
| task buildJniLib(type:Exec) { | ||
| dependsOn cmakeJniLib | ||
| def cmakePath = findExecutable("cmake") | ||
| logger.lifecycle("Using cmake at: ${cmakePath}") | ||
navneet1v marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if (cmakePath.isEmpty()) { | ||
| throw new GradleException("CMake not found in PATH. Please install CMake.") | ||
| } | ||
|
|
||
| commandLine cmakePath, | ||
| '--build', 'jni/build', | ||
| '--target', 'opensearchknn_faiss', 'opensearchknn_common', | ||
| '--parallel', "${nproc_count}" | ||
| } | ||
|
|
||
| test { | ||
| dependsOn buildNmslib | ||
| dependsOn buildJniLib | ||
| systemProperty 'tests.security.manager', 'false' | ||
| systemProperty "java.library.path", "$rootDir/jni/build/release" | ||
| //this change enables mockito-inline that supports mocking of static classes/calls | ||
| systemProperty "jdk.attach.allowAttachSelf", true | ||
| if (Os.isFamily(Os.FAMILY_WINDOWS)) { | ||
| // Add the paths of built JNI libraries and its dependent libraries to PATH variable in System variables | ||
| environment('PATH', System.getenv('PATH') + ";$rootDir/jni/build/release" + ";$rootDir/src/main/resources/windowsDependencies") | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -454,7 +462,7 @@ integTest { | |
| } | ||
| systemProperty 'tests.security.manager', 'false' | ||
| systemProperty 'java.io.tmpdir', opensearch_tmp_dir.absolutePath | ||
| systemProperty "java.library.path", "$rootDir/jni/build/release" | ||
| // allows integration test classes to access test resource from project root path | ||
| systemProperty('project.root', project.rootDir.absolutePath) | ||
|
|
||
|
|
@@ -506,7 +514,7 @@ testClusters.integTest { | |
| plugin(project.tasks.bundlePlugin.archiveFile) | ||
| if (Os.isFamily(Os.FAMILY_WINDOWS)) { | ||
| // Add the paths of built JNI libraries and its dependent libraries to PATH variable in System variables | ||
| environment('PATH', System.getenv('PATH') + ";$rootDir/jni/build/release" + ";$rootDir/src/main/resources/windowsDependencies") | ||
| } | ||
|
|
||
| // Cluster shrink exception thrown if we try to set numberOfNodes to 1, so only apply if > 1 | ||
|
|
@@ -521,7 +529,7 @@ testClusters.integTest { | |
| debugPort += 1 | ||
| } | ||
| } | ||
| systemProperty("java.library.path", "$rootDir/jni/build/release") | ||
| systemProperty propertyKeys.breaker.useRealMemory, getBreakerSetting() | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.