Skip to content
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

Jump to bottom

[api] Adds support for unsigned datatype #2574

Merged
merged 1 commit into from
Apr 29, 2023
Merged

[api] Adds support for unsigned datatype #2574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 69 additions & 0 deletions api/src/main/java/ai/djl/ndarray/NDArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.nio.LongBuffer;
import java.nio.ShortBuffer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
Expand Down Expand Up @@ -260,6 +261,42 @@ default float[] toFloatArray() {
return ret;
}

/**
* Converts this {@code NDArray} to an short array.
*
* @return an int array
* @throws IllegalStateException when {@link DataType} of this {@code NDArray} mismatches
*/
default short[] toShortArray() {
if (getDataType() != DataType.INT16) {
throw new IllegalStateException(
"DataType mismatch, Required int" + " Actual " + getDataType());
}
ShortBuffer ib = toByteBuffer().asShortBuffer();
short[] ret = new short[ib.remaining()];
ib.get(ret);
return ret;
}

/**
* Converts this {@code NDArray} to an short array.
*
* @return an int array
* @throws IllegalStateException when {@link DataType} of this {@code NDArray} mismatches
*/
default int[] toUnsignedShortArray() {
if (getDataType() != DataType.UINT16) {
throw new IllegalStateException(
"DataType mismatch, Required int" + " Actual " + getDataType());
}
ShortBuffer ib = toByteBuffer().asShortBuffer();
int[] ret = new int[ib.remaining()];
for (int i = 0; i < ret.length; ++i) {
ret[i] = ib.get() & 0xffff;
}
return ret;
}

/**
* Converts this {@code NDArray} to an int array.
*
Expand All @@ -277,6 +314,25 @@ default int[] toIntArray() {
return ret;
}

/**
* Converts this {@code NDArray} to an unsigned int array.
*
* @return a long array
* @throws IllegalStateException when {@link DataType} of this {@code NDArray} mismatches
*/
default long[] toUnsignedIntArray() {
if (getDataType() != DataType.UINT32) {
throw new IllegalStateException(
"DataType mismatch, Required int" + " Actual " + getDataType());
}
IntBuffer ib = toByteBuffer().asIntBuffer();
long[] ret = new long[ib.remaining()];
for (int i = 0; i < ret.length; ++i) {
ret[i] = ib.get() & 0X00000000FFFFFFFFL;
}
return ret;
}

/**
* Converts this {@code NDArray} to a long array.
*
Expand Down Expand Up @@ -370,6 +426,7 @@ default String[] toStringArray() {
*
* @return a Number array
*/
@SuppressWarnings("PMD.AvoidArrayLoops")
default Number[] toArray() {
switch (getDataType()) {
case FLOAT16:
Expand All @@ -380,9 +437,21 @@ default Number[] toArray() {
.toArray(Number[]::new);
case FLOAT64:
return Arrays.stream(toDoubleArray()).boxed().toArray(Double[]::new);
case INT16:
short[] buf = toShortArray();
Short[] sbuf = new Short[buf.length];
for (int i = 0; i < buf.length; ++i) {
sbuf[i] = buf[i];
}
return sbuf;
case UINT16:
return Arrays.stream(toUnsignedShortArray()).boxed().toArray(Integer[]::new);
case INT32:
return Arrays.stream(toIntArray()).boxed().toArray(Integer[]::new);
case UINT32:
return Arrays.stream(toUnsignedIntArray()).boxed().toArray(Long[]::new);
case INT64:
case UINT64:
return Arrays.stream(toLongArray()).boxed().toArray(Long[]::new);
case BOOLEAN:
case INT8:
Expand Down