Skip to content

Commit 5e62c89

Browse files
committed
[JAVA_API] update for element type passing
1 parent a845222 commit 5e62c89

File tree

4 files changed

+48
-7
lines changed

4 files changed

+48
-7
lines changed

modules/java_api/src/main/cpp/input_tensor_info.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ JNIEXPORT void JNICALL Java_org_intel_openvino_InputTensorInfo_SetElementType(JN
1313
{
1414
JNI_METHOD("SetElementType",
1515
preprocess::InputTensorInfo *info = (preprocess::InputTensorInfo *)addr;
16-
auto t_type = element::Type_t(type);
16+
auto t_type = get_ov_type(type);
1717

1818
info->set_element_type(t_type);
1919
)

modules/java_api/src/main/cpp/jni_common.hpp

+34
Original file line numberDiff line numberDiff line change
@@ -231,3 +231,37 @@ static jobject vectorToJavaList(JNIEnv *env, std::vector<std::string> items)
231231

232232
return nullptr;
233233
}
234+
235+
static const ov::element::Type_t& get_ov_type(int type)
236+
{
237+
static const std::vector<ov::element::Type_t> java_type_to_ov_type
238+
{
239+
ov::element::Type_t::undefined,
240+
ov::element::Type_t::dynamic,
241+
ov::element::Type_t::boolean,
242+
ov::element::Type_t::bf16,
243+
ov::element::Type_t::f16,
244+
ov::element::Type_t::f32,
245+
ov::element::Type_t::f64,
246+
ov::element::Type_t::i4,
247+
ov::element::Type_t::i8,
248+
ov::element::Type_t::i16,
249+
ov::element::Type_t::i32,
250+
ov::element::Type_t::i64,
251+
ov::element::Type_t::u1,
252+
ov::element::Type_t::u2,
253+
ov::element::Type_t::u3,
254+
ov::element::Type_t::u4,
255+
ov::element::Type_t::u6,
256+
ov::element::Type_t::u8,
257+
ov::element::Type_t::u16,
258+
ov::element::Type_t::u32,
259+
ov::element::Type_t::u64,
260+
ov::element::Type_t::nf4,
261+
ov::element::Type_t::f8e4m3,
262+
ov::element::Type_t::f8e5m2,
263+
ov::element::Type_t::string
264+
};
265+
266+
return java_type_to_ov_type.at(type);
267+
}

modules/java_api/src/main/cpp/tensor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ JNIEXPORT jlong JNICALL Java_org_intel_openvino_Tensor_TensorCArray(JNIEnv *env,
1313
{
1414
JNI_METHOD(
1515
"TensorCArray",
16-
auto input_type = element::Type_t(type);
16+
auto input_type = get_ov_type(type);
1717
Shape input_shape = jintArrayToVector(env, shape);
1818
Tensor *ov_tensor = new Tensor();
1919

modules/java_api/src/main/java/org/intel/openvino/ElementType.java

+12-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,18 @@ public enum ElementType {
2020
i32(10),
2121
i64(11),
2222
u1(12),
23-
u4(13),
24-
u8(14),
25-
u16(15),
26-
u32(16),
27-
u64(17);
23+
u2(13),
24+
u3(14),
25+
u4(15),
26+
u6(16),
27+
u8(17),
28+
u16(18),
29+
u32(19),
30+
u64(20),
31+
nf4(21),
32+
f8e4m3(22),
33+
f8e5m2(23),
34+
string(24);
2835

2936
private int value;
3037
private static Map<Integer, ElementType> map = new HashMap<Integer, ElementType>();

0 commit comments

Comments
 (0)