Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
8859b83e
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
8859b83e
编写于
8月 11, 2020
作者:
H
hangq
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug in java api
上级
01158763
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
22 addition
and
22 deletion
+22
-22
mindspore/lite/java/src/java/cn/huawei/mindspore/Model.java
mindspore/lite/java/src/java/cn/huawei/mindspore/Model.java
+1
-1
mindspore/lite/java/src/native/runtime/context.cpp
mindspore/lite/java/src/native/runtime/context.cpp
+1
-1
mindspore/lite/java/src/native/runtime/lite_session.cpp
mindspore/lite/java/src/native/runtime/lite_session.cpp
+10
-10
mindspore/lite/java/src/native/runtime/model.cpp
mindspore/lite/java/src/native/runtime/model.cpp
+1
-1
mindspore/lite/java/src/native/runtime/ms_tensor.cpp
mindspore/lite/java/src/native/runtime/ms_tensor.cpp
+9
-9
未找到文件。
mindspore/lite/java/src/java/cn/huawei/mindspore/Model.java
浏览文件 @
8859b83e
...
...
@@ -56,7 +56,7 @@ public class Model {
}
if
(
null
!=
fileDescriptor
)
{
try
{
fi
s
.
close
();
fi
leDescriptor
.
close
();
}
catch
(
IOException
e
)
{
Log
.
e
(
"MS_LITE"
,
"Close fileDescriptor failed: "
+
e
.
getMessage
());
}
...
...
mindspore/lite/java/src/native/runtime/context.cpp
浏览文件 @
8859b83e
...
...
@@ -59,7 +59,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_cn_huawei_mindspore_context_Context_crea
extern
"C"
JNIEXPORT
void
JNICALL
Java_cn_huawei_mindspore_context_Context_free
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
context_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
context_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
context_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Context pointer from java is nullptr"
);
return
;
...
...
mindspore/lite/java/src/native/runtime/lite_session.cpp
浏览文件 @
8859b83e
...
...
@@ -24,7 +24,7 @@
extern
"C"
JNIEXPORT
jlong
JNICALL
Java_cn_huawei_mindspore_LiteSession_createSession
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
context_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
context_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
context_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Context pointer from java is nullptr"
);
return
jlong
(
nullptr
);
...
...
@@ -41,13 +41,13 @@ extern "C" JNIEXPORT jlong JNICALL Java_cn_huawei_mindspore_LiteSession_createSe
extern
"C"
JNIEXPORT
jboolean
JNICALL
Java_cn_huawei_mindspore_LiteSession_compileGraph
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
session_ptr
,
jlong
model_ptr
)
{
auto
*
session_pointer
=
static
_cast
<
void
*>
(
session_ptr
);
auto
*
session_pointer
=
reinterpret
_cast
<
void
*>
(
session_ptr
);
if
(
session_pointer
==
nullptr
)
{
MS_LOGE
(
"Session pointer from java is nullptr"
);
return
(
jboolean
)
false
;
}
auto
*
lite_session_ptr
=
static_cast
<
mindspore
::
session
::
LiteSession
*>
(
session_pointer
);
auto
*
model_pointer
=
static
_cast
<
void
*>
(
model_ptr
);
auto
*
model_pointer
=
reinterpret
_cast
<
void
*>
(
model_ptr
);
if
(
model_pointer
==
nullptr
)
{
MS_LOGE
(
"Model pointer from java is nullptr"
);
return
(
jboolean
)
false
;
...
...
@@ -60,7 +60,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_cn_huawei_mindspore_LiteSession_compi
extern
"C"
JNIEXPORT
void
JNICALL
Java_cn_huawei_mindspore_LiteSession_bindThread
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
session_ptr
,
jboolean
if_bind
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
session_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
session_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Session pointer from java is nullptr"
);
return
;
...
...
@@ -71,7 +71,7 @@ extern "C" JNIEXPORT void JNICALL Java_cn_huawei_mindspore_LiteSession_bindThrea
extern
"C"
JNIEXPORT
jboolean
JNICALL
Java_cn_huawei_mindspore_LiteSession_runGraph
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
session_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
session_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
session_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Session pointer from java is nullptr"
);
return
(
jboolean
)
false
;
...
...
@@ -90,7 +90,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_cn_huawei_mindspore_LiteSession_getInp
jclass
long_object
=
env
->
FindClass
(
"java/lang/Long"
);
jmethodID
long_object_construct
=
env
->
GetMethodID
(
long_object
,
"<init>"
,
"(J)V"
);
auto
*
pointer
=
static
_cast
<
void
*>
(
session_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
session_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Session pointer from java is nullptr"
);
return
ret
;
...
...
@@ -114,7 +114,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_cn_huawei_mindspore_LiteSession_getInp
jclass
long_object
=
env
->
FindClass
(
"java/lang/Long"
);
jmethodID
long_object_construct
=
env
->
GetMethodID
(
long_object
,
"<init>"
,
"(J)V"
);
auto
*
pointer
=
static
_cast
<
void
*>
(
session_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
session_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Session pointer from java is nullptr"
);
return
ret
;
...
...
@@ -135,7 +135,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_cn_huawei_mindspore_LiteSession_getOut
jobject
hash_map
=
env
->
NewObject
(
hash_map_clazz
,
hash_map_construct
);
jmethodID
hash_map_put
=
env
->
GetMethodID
(
hash_map_clazz
,
"put"
,
"(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"
);
auto
*
pointer
=
static
_cast
<
void
*>
(
session_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
session_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Session pointer from java is nullptr"
);
return
hash_map
;
...
...
@@ -170,7 +170,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_cn_huawei_mindspore_LiteSession_getOut
jclass
long_object
=
env
->
FindClass
(
"java/lang/Long"
);
jmethodID
long_object_construct
=
env
->
GetMethodID
(
long_object
,
"<init>"
,
"(J)V"
);
auto
*
pointer
=
static
_cast
<
void
*>
(
session_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
session_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Session pointer from java is nullptr"
);
return
ret
;
...
...
@@ -186,7 +186,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_cn_huawei_mindspore_LiteSession_getOut
extern
"C"
JNIEXPORT
void
JNICALL
Java_cn_huawei_mindspore_LiteSession_free
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
session_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
session_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
session_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Session pointer from java is nullptr"
);
return
;
...
...
mindspore/lite/java/src/native/runtime/model.cpp
浏览文件 @
8859b83e
...
...
@@ -40,7 +40,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_cn_huawei_mindspore_Model_loadModel(JNIE
}
extern
"C"
JNIEXPORT
void
JNICALL
Java_cn_huawei_mindspore_Model_free
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
model_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
model_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
model_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Model pointer from java is nullptr"
);
return
;
...
...
mindspore/lite/java/src/native/runtime/ms_tensor.cpp
浏览文件 @
8859b83e
...
...
@@ -41,7 +41,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_cn_huawei_mindspore_MSTensor_createMSTen
extern
"C"
JNIEXPORT
jintArray
JNICALL
Java_cn_huawei_mindspore_MSTensor_getShape
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
tensor_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
env
->
NewIntArray
(
0
);
...
...
@@ -64,7 +64,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_cn_huawei_mindspore_MSTensor_setShape
jint
shape_len
)
{
jboolean
is_copy
=
false
;
jint
*
local_shape_arr
=
env
->
GetIntArrayElements
(
shape
,
&
is_copy
);
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
static_cast
<
jboolean
>
(
false
);
...
...
@@ -80,7 +80,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_cn_huawei_mindspore_MSTensor_setShape
extern
"C"
JNIEXPORT
jint
JNICALL
Java_cn_huawei_mindspore_MSTensor_getDataType
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
tensor_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
static_cast
<
jboolean
>
(
false
);
...
...
@@ -91,7 +91,7 @@ extern "C" JNIEXPORT jint JNICALL Java_cn_huawei_mindspore_MSTensor_getDataType(
extern
"C"
JNIEXPORT
jboolean
JNICALL
Java_cn_huawei_mindspore_MSTensor_setDataType
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
tensor_ptr
,
jint
data_type
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
static_cast
<
jboolean
>
(
false
);
...
...
@@ -103,7 +103,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_cn_huawei_mindspore_MSTensor_setDataT
extern
"C"
JNIEXPORT
jbyteArray
JNICALL
Java_cn_huawei_mindspore_MSTensor_getData
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
tensor_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
env
->
NewByteArray
(
0
);
...
...
@@ -123,7 +123,7 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_cn_huawei_mindspore_MSTensor_getDat
extern
"C"
JNIEXPORT
jboolean
JNICALL
Java_cn_huawei_mindspore_MSTensor_setData
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
tensor_ptr
,
jbyteArray
data
,
jlong
data_len
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
static_cast
<
jboolean
>
(
false
);
...
...
@@ -141,7 +141,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_cn_huawei_mindspore_MSTensor_setData(
}
extern
"C"
JNIEXPORT
jlong
JNICALL
Java_cn_huawei_mindspore_MSTensor_size
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
tensor_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
0
;
...
...
@@ -152,7 +152,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_cn_huawei_mindspore_MSTensor_size(JNIEnv
extern
"C"
JNIEXPORT
jint
JNICALL
Java_cn_huawei_mindspore_MSTensor_elementsNum
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
tensor_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
0
;
...
...
@@ -162,7 +162,7 @@ extern "C" JNIEXPORT jint JNICALL Java_cn_huawei_mindspore_MSTensor_elementsNum(
}
extern
"C"
JNIEXPORT
void
JNICALL
Java_cn_huawei_mindspore_MSTensor_free
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
tensor_ptr
)
{
auto
*
pointer
=
static
_cast
<
void
*>
(
tensor_ptr
);
auto
*
pointer
=
reinterpret
_cast
<
void
*>
(
tensor_ptr
);
if
(
pointer
==
nullptr
)
{
MS_LOGE
(
"Tensor pointer from java is nullptr"
);
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录