Browse Source

fix train lite demo bug

tags/v1.3.0
zhengjun10 4 years ago
parent
commit
f054829913
5 changed files with 7 additions and 7 deletions
  1. +1
    -0
      mindspore/lite/java/java/app/src/main/java/com/mindspore/lite/LiteSession.java
  2. +2
    -0
      mindspore/lite/java/java/fl_client/src/main/java/com/mindspore/flclient/model/TrainLenet.java
  3. +1
    -0
      mindspore/lite/java/java/linux_x86/src/main/java/com.mindspore.lite/LiteSession.java
  4. +2
    -6
      mindspore/lite/java/native/runtime/train_session.cpp
  5. +1
    -1
      mindspore/lite/test/st/scripts/run_benchmark_x86.sh

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

@@ -28,6 +28,7 @@ import com.mindspore.lite.config.MSConfig;
public class LiteSession {
static {
System.loadLibrary("mindspore-lite-jni");
System.loadLibrary("mindspore-lite-train-jni");
}

private long sessionPtr = 0;


+ 2
- 0
mindspore/lite/java/java/fl_client/src/main/java/com/mindspore/flclient/model/TrainLenet.java View File

@@ -108,6 +108,8 @@ public class TrainLenet extends TrainModel {
labelArray[j * NUM_OF_CLASS + labelByteArray[i]] = 1;
j++;
}
} else {
labelArray = null; // labelArray may be initialized from train
}

return trainSampleSize;


+ 1
- 0
mindspore/lite/java/java/linux_x86/src/main/java/com.mindspore.lite/LiteSession.java View File

@@ -28,6 +28,7 @@ import com.mindspore.lite.config.MSConfig;
public class LiteSession {
static {
System.loadLibrary("mindspore-lite-jni");
System.loadLibrary("mindspore-lite-train-jni");
}

private long sessionPtr = 0;


+ 2
- 6
mindspore/lite/java/native/runtime/train_session.cpp View File

@@ -20,10 +20,8 @@
#include "include/train/train_cfg.h"
#include "include/errorcode.h"

extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_lite_LiteSession_createTrainSession(JNIEnv *env, jobject thiz,
jstring file_name,
jlong ms_context_ptr,
jboolean train_mode) {
extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_lite_LiteSession_createTrainSession(
JNIEnv *env, jobject thiz, jstring file_name, jlong ms_context_ptr, jboolean train_mode, jlong train_config_ptr) {
auto *pointer = reinterpret_cast<void *>(ms_context_ptr);
if (pointer == nullptr) {
MS_LOGE("Context pointer from java is nullptr");
@@ -39,5 +37,3 @@ extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_lite_LiteSession_createTra
}
return jlong(session);
}



+ 1
- 1
mindspore/lite/test/st/scripts/run_benchmark_x86.sh View File

@@ -237,7 +237,7 @@ function Run_x86_java() {
cp ${x86_path}/avx/mindspore-lite-${version}-linux-x64.tar.gz ./java/ || exit 1
cd ./java || exit 1
tar -zxf mindspore-lite-${version}-linux-x64.tar.gz || exit 1
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${x86_path}/java/mindspore-lite-${version}-linux-x64/runtime/lib
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${x86_path}/java/mindspore-lite-${version}-linux-x64/runtime/lib:${x86_path}/java/mindspore-lite-${version}-linux-x64/runtime/third_party/libjpeg-turbo/lib
# compile benchmark
echo "javac -cp ${x86_path}/java/mindspore-lite-${version}-linux-x64/runtime/lib/mindspore-lite-java.jar ${basepath}/java/src/main/java/Benchmark.java -d ."
javac -cp ${x86_path}/java/mindspore-lite-${version}-linux-x64/runtime/lib/mindspore-lite-java.jar ${basepath}/java/src/main/java/Benchmark.java -d .


Loading…
Cancel
Save