Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!33494 modify java jni 

Merge pull request !33494 from liyan2022/dev_r1.6
This commit is contained in:
i-robot 2022-04-25 12:21:09 +00:00 committed by Gitee
parent c8092b7143 df8a023e0b
commit 78e17e5464
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mindspore/lite/java/src/main/java/com/mindspore/config/Version.java
View File

@ -26,7 +26,9 @@ import com.mindspore.lite.NativeLibrary;
public class Version {
static {
try {
NativeLibrary.loadLibs();
if (!NativeLibrary.loadLibrary()) {
NativeLibrary.loadLibs();
}
} catch (Exception e) {
System.err.println("Failed to load MindSporLite native library.");
e.printStackTrace();

27
mindspore/lite/java/src/main/java/com/mindspore/lite/NativeLibrary.java
View File

@ -34,17 +34,30 @@ public class NativeLibrary {
return true;
}
private static boolean loadLibrary() {
public static boolean loadLibrary() {
boolean loadSuccess = false;
try {
System.loadLibrary(GLOG_LIBNAME);
System.loadLibrary(MINDSPORE_LITE_LIBNAME);
System.loadLibrary(MINDSPORE_LITE_JNI_LIBNAME);
LOGGER.info("loadLibrary: success");
return true;
LOGGER.info("loadLibrary " + GLOG_LIBNAME + ": success");
loadSuccess = true;
} catch (UnsatisfiedLinkError e) {
LOGGER.warning("tryLoadLibraryFailed: " + e.getMessage());
return false;
LOGGER.info("tryLoadLibrary " + GLOG_LIBNAME + " failed: " + e.getMessage());
}
try {
System.loadLibrary(MINDSPORE_LITE_LIBNAME);
LOGGER.info("loadLibrary " + MINDSPORE_LITE_LIBNAME + ": success");
loadSuccess = true;
} catch (UnsatisfiedLinkError e) {
LOGGER.info("tryLoadLibrary " + MINDSPORE_LITE_LIBNAME + " failed: " + e.getMessage());
}
try {
System.loadLibrary(MINDSPORE_LITE_JNI_LIBNAME);
LOGGER.info("loadLibrary " + MINDSPORE_LITE_JNI_LIBNAME + ": success");
loadSuccess = true;
} catch (UnsatisfiedLinkError e) {
LOGGER.info("tryLoadLibrary " + MINDSPORE_LITE_JNI_LIBNAME + " failed: " + e.getMessage());
}
return loadSuccess;
}
private static void loadLib(String libResourceName) {