diff options
author | Miao Wang <miaowang@google.com> | 2015-07-01 05:12:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 05:12:07 +0000 |
commit | 8a752abe77a4387bbe099befa972870ee0a48bbf (patch) | |
tree | 64c32e7df6ca579dab45bbdebf416d4adb1a53a9 /rs/java/android/renderscript/ScriptIntrinsicBLAS.java | |
parent | e0b71b4ef7af0a8e49341ba65eaf61981845e713 (diff) | |
parent | 6099ee6e081904e73e0fad331e326b0607b6b1dc (diff) | |
download | frameworks_base-8a752abe77a4387bbe099befa972870ee0a48bbf.zip frameworks_base-8a752abe77a4387bbe099befa972870ee0a48bbf.tar.gz frameworks_base-8a752abe77a4387bbe099befa972870ee0a48bbf.tar.bz2 |
Merge "[RenderScript] update the type of offsets for BLAS.BNNM" into mnc-dev
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicBLAS.java')
-rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicBLAS.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicBLAS.java b/rs/java/android/renderscript/ScriptIntrinsicBLAS.java index aa72fba..06134e5 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicBLAS.java +++ b/rs/java/android/renderscript/ScriptIntrinsicBLAS.java @@ -3277,11 +3277,11 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { * just before there's a shift down to drop the fractional parts. The output * values are gated to 0 to 255 to fit in a byte, but the 10-bit format * gives some headroom to avoid wrapping around on small overflows. - * + * * @param A The input allocation contains matrix A, supported elements type {@link Element#U8}. - * @param a_offset The offset for all values in matrix A, e.g A[i,j] = A[i,j] - a_offset. + * @param a_offset The offset for all values in matrix A, e.g A[i,j] = A[i,j] - a_offset. Value should be from 0 to 255. * @param B The input allocation contains matrix B, supported elements type {@link Element#U8}. - * @param b_offset The offset for all values in matrix B, e.g B[i,j] = B[i,j] - b_offset. + * @param b_offset The offset for all values in matrix B, e.g B[i,j] = B[i,j] - b_offset. Value should be from 0 to 255. * @param C The input allocation contains matrix C, supported elements type {@link Element#U8}. * @param c_offset The offset for all values in matrix C. * @param c_mult The multiplier for all values in matrix C, e.g C[i,j] = (C[i,j] + c_offset) * c_mult. @@ -3289,6 +3289,12 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { public void BNNM(Allocation A, int a_offset, Allocation B, int b_offset, Allocation C, int c_offset, int c_mult) { validateL3(Element.U8(mRS), NO_TRANSPOSE, TRANSPOSE, 0, A, B, C); + if (a_offset < 0 || a_offset > 255) { + throw new RSRuntimeException("Invalid a_offset passed to BNNM"); + } + if (b_offset < 0 || b_offset > 255) { + throw new RSRuntimeException("Invalid b_offset passed to BNNM"); + } int M = -1, N = -1, K = -1; M = A.getType().getY(); N = B.getType().getY(); |