Skip to content

Commit 61d3193

Browse files
authored
[JAVA_API] Fix ElementType compatibility problem introduced in 2025.1 (#963)
Breaking change was introduced in this commit: openvinotoolkit/openvino@d9c2aee ElementType.undefined was deprecated and its value was changed to be equal to ElementType.dynamic which caused a shift of the value of the remaining types.
1 parent fda6fb5 commit 61d3193

File tree

5 files changed

+33
-32
lines changed

5 files changed

+33
-32
lines changed

modules/java_api/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ println 'CPU architecture: ' + arch
1111

1212

1313
def nativesCPP;
14-
def openvinoVersion = "2024.2"
14+
def openvinoVersion = "2025.1"
1515

1616
def native_resources = []
1717
def tbb_dir = System.getenv('TBB_DIR')

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ static const ov::element::Type_t& get_ov_type(int type)
236236
{
237237
static const std::vector<ov::element::Type_t> java_type_to_ov_type
238238
{
239-
ov::element::Type_t::dynamic,
240239
ov::element::Type_t::dynamic,
241240
ov::element::Type_t::boolean,
242241
ov::element::Type_t::bf16,
@@ -261,7 +260,8 @@ static const ov::element::Type_t& get_ov_type(int type)
261260
ov::element::Type_t::f8e4m3,
262261
ov::element::Type_t::f8e5m2,
263262
ov::element::Type_t::string,
264-
ov::element::Type_t::f4e2m1
263+
ov::element::Type_t::f4e2m1,
264+
ov::element::Type_t::f8e8m0
265265
};
266266

267267
return java_type_to_ov_type.at(type);

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

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,33 @@
77
import java.util.Map;
88

99
public enum ElementType {
10-
undefined(0),
11-
dynamic(1),
12-
bool(2),
13-
bf16(3),
14-
f16(4),
15-
f32(5),
16-
f64(6),
17-
i4(7),
18-
i8(8),
19-
i16(9),
20-
i32(10),
21-
i64(11),
22-
u1(12),
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),
35-
f4e2m1(25);
10+
dynamic(0),
11+
undefined(dynamic.value),
12+
bool(1),
13+
bf16(2),
14+
f16(3),
15+
f32(4),
16+
f64(5),
17+
i4(6),
18+
i8(7),
19+
i16(8),
20+
i32(9),
21+
i64(10),
22+
u1(11),
23+
u2(12),
24+
u3(13),
25+
u4(14),
26+
u6(15),
27+
u8(16),
28+
u16(17),
29+
u32(18),
30+
u64(19),
31+
nf4(20),
32+
f8e4m3(21),
33+
f8e5m2(22),
34+
string(23),
35+
f4e2m1(24),
36+
f8e8m0(25);
3637

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

modules/java_api/src/test/java/org/intel/openvino/CompiledModelTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void testInputs() {
2323
List<Output> inputs = model.inputs();
2424

2525
assertEquals("data", inputs.get(0).get_any_name());
26-
assertEquals(ElementType.f16, inputs.get(0).get_element_type());
26+
assertEquals(ElementType.f32, inputs.get(0).get_element_type());
2727

2828
int[] shape = new int[] {1, 3, 32, 32};
2929
assertArrayEquals("Shape", shape, inputs.get(0).get_shape());
@@ -34,7 +34,7 @@ public void testOutputs() {
3434
List<Output> outputs = model.outputs();
3535

3636
assertEquals("fc_out", outputs.get(0).get_any_name());
37-
assertEquals(ElementType.f16, outputs.get(0).get_element_type());
37+
assertEquals(ElementType.f32, outputs.get(0).get_element_type());
3838

3939
int[] shape = new int[] {1, 10};
4040
assertArrayEquals("Shape", shape, outputs.get(0).get_shape());

modules/java_api/src/test/java/org/intel/openvino/ModelTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void testOutputName() {
3434
@Test
3535
public void testOutputType() {
3636
Output output = net.output();
37-
assertEquals("Output element type", ElementType.f16, output.get_element_type());
37+
assertEquals("Output element type", ElementType.f32, output.get_element_type());
3838
}
3939

4040
@Test

0 commit comments

Comments
 (0)