diff options
| author | Miao Wang <miaowang@google.com> | 2015-04-30 21:25:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 21:25:03 +0000 |
| commit | 01060a33a446a496cafcb06487c60df25775a1b9 (patch) | |
| tree | d66047dcf11ba494cf525380898714f5132997e0 /rs | |
| parent | ac7927a89519a79ab73723a13ed9ea12ca16056f (diff) | |
| parent | 1e940d87c46edc672964c7674cff8da6441e9559 (diff) | |
| download | frameworks_base-01060a33a446a496cafcb06487c60df25775a1b9.zip frameworks_base-01060a33a446a496cafcb06487c60df25775a1b9.tar.gz frameworks_base-01060a33a446a496cafcb06487c60df25775a1b9.tar.bz2 | |
Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicBLAS.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicBLAS.java b/rs/java/android/renderscript/ScriptIntrinsicBLAS.java index a387aab..149c0be 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicBLAS.java +++ b/rs/java/android/renderscript/ScriptIntrinsicBLAS.java @@ -1012,7 +1012,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { } } else { if (A != null) { - if (TransA != NO_TRANSPOSE) { + if (TransA == TRANSPOSE || TransA == CONJ_TRANSPOSE) { aN = A.getType().getY(); aM = A.getType().getX(); } else { @@ -1021,7 +1021,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { } } if (B != null) { - if (TransB != NO_TRANSPOSE) { + if (TransB == TRANSPOSE || TransB == CONJ_TRANSPOSE) { bN = B.getType().getY(); bM = B.getType().getX(); } else { @@ -1272,7 +1272,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { validateUplo(Uplo); validateSYR2K(Element.F32(mRS), Trans, A, B, C); int K = -1; - if (Trans == TRANSPOSE) { + if (Trans != NO_TRANSPOSE) { K = A.getType().getY(); } else { K = A.getType().getX(); @@ -1283,7 +1283,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { validateUplo(Uplo); validateSYR2K(Element.F64(mRS), Trans, A, B, C); int K = -1; - if (Trans == TRANSPOSE) { + if (Trans != NO_TRANSPOSE) { K = A.getType().getY(); } else { K = A.getType().getX(); @@ -1294,7 +1294,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { validateUplo(Uplo); validateSYR2K(Element.F32_2(mRS), Trans, A, B, C); int K = -1; - if (Trans == TRANSPOSE) { + if (Trans != NO_TRANSPOSE) { K = A.getType().getY(); } else { K = A.getType().getX(); @@ -1305,7 +1305,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { validateUplo(Uplo); validateSYR2K(Element.F64_2(mRS), Trans, A, B, C); int K = -1; - if (Trans == TRANSPOSE) { + if (Trans != NO_TRANSPOSE) { K = A.getType().getY(); } else { K = A.getType().getX(); |