Browse Source

change gradlew to gradle and delete something unused code

tags/v1.1.0
yeyunpeng 5 years ago
parent
commit
9d8efc2a27
5 changed files with 7 additions and 10 deletions
  1. +0
    -1
      mindspore/lite/java/java/app/build.gradle
  2. +0
    -2
      mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/DataType.java
  3. +2
    -2
      mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/LiteSession.java
  4. +4
    -4
      mindspore/lite/java/java/app/src/main/native/CMakeLists.txt
  5. +1
    -1
      mindspore/lite/java/java/app/src/main/native/runtime/version.cpp

+ 0
- 1
mindspore/lite/java/java/app/build.gradle View File

@@ -4,7 +4,6 @@ apply plugin: 'maven-publish'
android { android {
compileSdkVersion 30 compileSdkVersion 30
buildToolsVersion "30.0.1" buildToolsVersion "30.0.1"

defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 30 targetSdkVersion 30


+ 0
- 2
mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/DataType.java View File

@@ -32,6 +32,4 @@ public class DataType {
public static final int kNumberTypeFloat16 = 42; public static final int kNumberTypeFloat16 = 42;
public static final int kNumberTypeFloat32 = 43; public static final int kNumberTypeFloat32 = 43;
public static final int kNumberTypeFloat64 = 44; public static final int kNumberTypeFloat64 = 44;

public static native int elementSize(int elementType);
} }

+ 2
- 2
mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/LiteSession.java View File

@@ -132,7 +132,7 @@ public class LiteSession {


private native List<Long> getInputs(long sessionPtr); private native List<Long> getInputs(long sessionPtr);


private native Long getInputsByTensorName(long sessionPtr, String tensorName);
private native long getInputsByTensorName(long sessionPtr, String tensorName);


private native List<Long> getOutputsByNodeName(long sessionPtr, String nodeName); private native List<Long> getOutputsByNodeName(long sessionPtr, String nodeName);


@@ -140,7 +140,7 @@ public class LiteSession {


private native List<String> getOutputTensorNames(long sessionPtr); private native List<String> 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); private native void free(long sessionPtr);




+ 4
- 4
mindspore/lite/java/java/app/src/main/native/CMakeLists.txt View File

@@ -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(BUILD_LITE "on")
set(PLATFORM_ARM "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(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${LITE_DIR}) ## lite include include_directories(${LITE_DIR}) ## lite include
include_directories(${TOP_DIR}/mindspore/core/) ## core 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}/) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/)


@@ -46,4 +46,4 @@ add_library(mindspore-lite-jni SHARED


find_library(log-lib log) find_library(log-lib log)


target_link_libraries(mindspore-lite-jni mindspore-lite ${log-lib} )
target_link_libraries(mindspore-lite-jni mindspore-lite ${log-lib})

+ 1
- 1
mindspore/lite/java/java/app/src/main/native/runtime/version.cpp View File

@@ -18,6 +18,6 @@
#include "common/ms_log.h" #include "common/ms_log.h"
#include "include/version.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()); return env->NewStringUTF(mindspore::lite::Version().c_str());
} }

Loading…
Cancel
Save