From 9d8efc2a2722d245fa4ba35b0252ea26dd38b388 Mon Sep 17 00:00:00 2001 From: yeyunpeng Date: Sun, 8 Nov 2020 15:50:46 +0800 Subject: [PATCH] change gradlew to gradle and delete something unused code --- mindspore/lite/java/java/app/build.gradle | 1 - .../app/src/main/java/com/mindspore/lite/DataType.java | 2 -- .../app/src/main/java/com/mindspore/lite/LiteSession.java | 4 ++-- .../lite/java/java/app/src/main/native/CMakeLists.txt | 8 ++++---- .../java/java/app/src/main/native/runtime/version.cpp | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mindspore/lite/java/java/app/build.gradle b/mindspore/lite/java/java/app/build.gradle index 0809ce526f..2395a410a1 100644 --- a/mindspore/lite/java/java/app/build.gradle +++ b/mindspore/lite/java/java/app/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'maven-publish' android { compileSdkVersion 30 buildToolsVersion "30.0.1" - defaultConfig { minSdkVersion 19 targetSdkVersion 30 diff --git a/mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/DataType.java b/mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/DataType.java index bd249fef32..9812103a5a 100644 --- a/mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/DataType.java +++ b/mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/DataType.java @@ -32,6 +32,4 @@ public class DataType { public static final int kNumberTypeFloat16 = 42; public static final int kNumberTypeFloat32 = 43; public static final int kNumberTypeFloat64 = 44; - - public static native int elementSize(int elementType); } diff --git a/mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/LiteSession.java b/mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/LiteSession.java index 411a2bd1c0..a2b672d834 100644 --- a/mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/LiteSession.java +++ b/mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/LiteSession.java @@ -132,7 +132,7 @@ public class LiteSession { private native List getInputs(long sessionPtr); - private native Long getInputsByTensorName(long sessionPtr, String tensorName); + private native long getInputsByTensorName(long sessionPtr, String tensorName); private native List getOutputsByNodeName(long sessionPtr, String nodeName); @@ -140,7 +140,7 @@ public class LiteSession { private native List getOutputTensorNames(long sessionPtr); - private native Long getOutputByTensorName(long sessionPtr, String tensorName); + private native long getOutputByTensorName(long sessionPtr, String tensorName); private native void free(long sessionPtr); diff --git a/mindspore/lite/java/java/app/src/main/native/CMakeLists.txt b/mindspore/lite/java/java/app/src/main/native/CMakeLists.txt index 6ac4430964..5df2cb150e 100644 --- a/mindspore/lite/java/java/app/src/main/native/CMakeLists.txt +++ b/mindspore/lite/java/java/app/src/main/native/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) -project (Lite-java) +cmake_minimum_required(VERSION 3.10) +project(Lite-java) set(BUILD_LITE "on") set(PLATFORM_ARM "on") @@ -31,7 +31,7 @@ include(${TOP_DIR}/cmake/external_libs/flatbuffers.cmake) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${LITE_DIR}) ## lite include include_directories(${TOP_DIR}/mindspore/core/) ## core include -include_directories(${LITE_DIR}/build) +include_directories(${LITE_DIR}/build) ## flatbuffers link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/) @@ -46,4 +46,4 @@ add_library(mindspore-lite-jni SHARED find_library(log-lib log) -target_link_libraries(mindspore-lite-jni mindspore-lite ${log-lib} ) \ No newline at end of file +target_link_libraries(mindspore-lite-jni mindspore-lite ${log-lib}) \ No newline at end of file diff --git a/mindspore/lite/java/java/app/src/main/native/runtime/version.cpp b/mindspore/lite/java/java/app/src/main/native/runtime/version.cpp index b59ca51732..634215b950 100644 --- a/mindspore/lite/java/java/app/src/main/native/runtime/version.cpp +++ b/mindspore/lite/java/java/app/src/main/native/runtime/version.cpp @@ -18,6 +18,6 @@ #include "common/ms_log.h" #include "include/version.h" -extern "C" JNIEXPORT jstring JNICALL Java_com_mindspore_lite_Version_version(JNIEnv *env, jobject thiz) { +extern "C" JNIEXPORT jstring JNICALL Java_com_mindspore_lite_Version_version(JNIEnv *env, jclass thiz) { return env->NewStringUTF(mindspore::lite::Version().c_str()); }