diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-12 07:32:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-12 07:32:42 +0000 |
| commit | 848e0875bf1d5804a7c38e43a8ff526be3917184 (patch) | |
| tree | 4bcb4531cfbee1ccfece53d769e4f103f87261e6 | |
| parent | 04086248cfca6a42bb4e832b050d2ca50f06b258 (diff) | |
| parent | 480f65fab2b7406c90cdde7dab34b5cbd9075f78 (diff) | |
| download | rs-848e0875bf1d5804a7c38e43a8ff526be3917184.tar.gz | |
release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-4173087 snap-temp-L93200000081515229
Change-Id: I0798c0fc646e95ee2ba37050f77813bdc6660cb0
| -rw-r--r-- | OWNERS | 7 | ||||
| -rw-r--r-- | cpp/Android.bp | 1 | ||||
| -rw-r--r-- | cpp/rsDispatch.h | 8 | ||||
| -rw-r--r-- | cpu_ref/rsCpuIntrinsicBLAS.cpp | 4 | ||||
| -rw-r--r-- | support/jni/Android.bp | 1 |
5 files changed, 18 insertions, 3 deletions
@@ -1 +1,6 @@ -android-renderscript-dev+review@google.com +butlermichael@google.com +dgross@google.com +ijsung@google.com +jeanluc@google.com +miaowang@google.com +yangni@google.com diff --git a/cpp/Android.bp b/cpp/Android.bp index e25e39a4..853900c6 100644 --- a/cpp/Android.bp +++ b/cpp/Android.bp @@ -8,6 +8,7 @@ cc_library_static { cflags: [ "-Wno-unused-parameter", "-std=c++11", + "-DRS_COMPATIBILITY_LIB", ], sdk_version: "9", diff --git a/cpp/rsDispatch.h b/cpp/rsDispatch.h index 1bcd954b..953ba6bb 100644 --- a/cpp/rsDispatch.h +++ b/cpp/rsDispatch.h @@ -18,7 +18,6 @@ #define ANDROID_RSDISPATCH_H #include "rsInternalDefines.h" -#include "jni.h" typedef void (*SetNativeLibDirFnPtr)(RsContext con, const char *nativeLibDir, size_t length); typedef const void* (*AllocationGetTypeFnPtr)(RsContext con, RsAllocation va); @@ -263,6 +262,9 @@ struct dispatchTable { bool loadSymbols(void* handle, dispatchTable& dispatchTab, int device_api = 0); +#ifdef RS_COMPATIBILITY_LIB +#include "jni.h" + // USAGE_IO for RS Support lib typedef void (*sAllocationSetSurfaceFnPtr) (JNIEnv *, jobject, RsContext, RsAllocation, RsNativeWindow, dispatchTable); struct ioSuppDT { @@ -271,4 +273,6 @@ struct ioSuppDT { }; bool loadIOSuppSyms(void* handleIO, ioSuppDT& ioDispatch); -#endif
\ No newline at end of file +#endif // RS_COMPATIBILITY_LIB + +#endif diff --git a/cpu_ref/rsCpuIntrinsicBLAS.cpp b/cpu_ref/rsCpuIntrinsicBLAS.cpp index 4b086341..d60a3b90 100644 --- a/cpu_ref/rsCpuIntrinsicBLAS.cpp +++ b/cpu_ref/rsCpuIntrinsicBLAS.cpp @@ -877,6 +877,10 @@ void RsdCpuScriptIntrinsicBLAS::kernelBNNM(size_t m, size_t n, size_t k, #endif // Using gemmlowp to calculate the low precision 8 bit GEMM. + // Set MaxNumThreads to 0. The value 0 lets the implementation query + // the system to determine the number of hardware threads + gemmlowp::eight_bit_int_gemm::SetMaxNumThreads(0); + bool transpose_a = true; bool transpose_b = false; bool transpose_c = true; diff --git a/support/jni/Android.bp b/support/jni/Android.bp index 3c01fd04..e576fce4 100644 --- a/support/jni/Android.bp +++ b/support/jni/Android.bp @@ -63,6 +63,7 @@ cc_library_shared { "-Wextra", "-Wno-unused-parameter", "-std=c++11", + "-DRS_COMPATIBILITY_LIB", ], required: ["libRSSupport"], |