Skip to content

Android/fix evalue string serialization #17609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kirklandsign wants to merge 2 commits into
base: main
Choose a base branch
from
+49 −4
Draft

Android/fix evalue string serialization #17609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
292b571
Fix EValue string serialization and deserialization
kirklandsign Feb 21, 2026
8d18fec
Use Chinese and emoji strings in EValue serde tests
kirklandsign Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions extension/android/executorch_android/src/main/java/org/pytorch/executorch/EValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,14 @@ public byte[] toByteArray() {
} else if (isDouble()) {
return ByteBuffer.allocate(9).put((byte) TYPE_CODE_DOUBLE).putDouble(toDouble()).array();
} else if (isString()) {
return ByteBuffer.allocate(1 + toString().length())
byte[] strBytes = toStr().getBytes();
return ByteBuffer.allocate(1 + 4 + strBytes.length)
.put((byte) TYPE_CODE_STRING)
.put(toString().getBytes())
.putInt(strBytes.length)
.put(strBytes)
.array();
} else {
throw new IllegalArgumentException("Unknown Tensor dtype");
throw new IllegalArgumentException("Unknown EValue type code: " + mTypeCode);
}
}

Expand All @@ -234,7 +236,10 @@ public static EValue fromByteArray(byte[] bytes) {
byte[] bufferArray = buffer.array();
return from(Tensor.fromByteArray(Arrays.copyOfRange(bufferArray, 1, bufferArray.length)));
case TYPE_CODE_STRING:
throw new IllegalArgumentException("TYPE_CODE_STRING is not supported");
int strLen = buffer.getInt();
byte[] strBytes = new byte[strLen];
buffer.get(strBytes);
return from(new String(strBytes));
case TYPE_CODE_DOUBLE:
return from(buffer.getDouble());
case TYPE_CODE_INT:
Expand Down
40 changes: 40 additions & 0 deletions extension/android/executorch_android/src/test/java/org/pytorch/executorch/EValueTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,46 @@ class EValueTest {
assertEquals(1.345e-2, deser.toDouble(), 1e-6)
}

@Test
fun testStringSerde() {
val evalue = EValue.from("hello")
val bytes = evalue.toByteArray()

val deser = EValue.fromByteArray(bytes)
assertTrue(deser.isString)
assertEquals("hello", deser.toStr())
}

@Test
fun testEmptyStringSerde() {
val evalue = EValue.from("")
val bytes = evalue.toByteArray()

val deser = EValue.fromByteArray(bytes)
assertTrue(deser.isString)
assertEquals("", deser.toStr())
}

@Test
fun testChineseStringSerde() {
val evalue = EValue.from("你好世界")
val bytes = evalue.toByteArray()

val deser = EValue.fromByteArray(bytes)
assertTrue(deser.isString)
assertEquals("你好世界", deser.toStr())
}

@Test
fun testEmojiStringSerde() {
val evalue = EValue.from("👋🌍")
val bytes = evalue.toByteArray()

val deser = EValue.fromByteArray(bytes)
assertTrue(deser.isString)
assertEquals("👋🌍", deser.toStr())
}

@Test
fun testLongTensorSerde() {
val data = longArrayOf(1, 2, 3, 4)
Expand Down
Loading