diff --git a/mace/core/runtime/opencl/opencl_wrapper.cc b/mace/core/runtime/opencl/opencl_wrapper.cc index a7fd447e24d8d588959b1f31f8f4d9084584686f..f7706cffc55eabeb7fae31b6115845fe3083c9dd 100644 --- a/mace/core/runtime/opencl/opencl_wrapper.cc +++ b/mace/core/runtime/opencl/opencl_wrapper.cc @@ -268,22 +268,27 @@ bool OpenCLLibrary::Load() { return true; } + // Add customized OpenCL search path here const std::vector paths = { "libOpenCL.so", #if defined(__aarch64__) - // Qualcomm Adreno + // Qualcomm Adreno with Android "/system/vendor/lib64/libOpenCL.so", "/system/lib64/libOpenCL.so", - // Mali + // Mali with Android "/system/vendor/lib64/egl/libGLES_mali.so", "/system/lib64/egl/libGLES_mali.so", + // Typical Linux board + "/usr/lib/aarch64-linux-gnu/libOpenCL.so", #else - // Qualcomm Adreno + // Qualcomm Adreno with Android "/system/vendor/lib/libOpenCL.so", "/system/lib/libOpenCL.so", - // Mali + // Mali with Android "/system/vendor/lib/egl/libGLES_mali.so", "/system/lib/egl/libGLES_mali.so", + // Typical Linux board + "/usr/lib/arm-linux-gnueabihf/libOpenCL.so", #endif }; diff --git a/tools/aarch64_compiler/CROSSTOOL b/tools/aarch64_compiler/CROSSTOOL index dbc3ac551b549f5bd90a6eeee774f8dc32aefb58..0180cc1ed5f4d0e8567f7661dcee56ad206b5b6f 100644 --- a/tools/aarch64_compiler/CROSSTOOL +++ b/tools/aarch64_compiler/CROSSTOOL @@ -14,7 +14,7 @@ toolchain { compiler: "gcc" host_system_name: "aarch64" needsPic: true - supports_gold_linker: false + supports_gold_linker: true supports_incremental_linker: false supports_fission: false supports_interface_shared_objects: false diff --git a/tools/arm_compiler/CROSSTOOL b/tools/arm_compiler/CROSSTOOL index 82237dd3bbd67710444f5a663fd769e4803c1eac..592fb12cca4406531589f9b8d68925d153eb5fe9 100644 --- a/tools/arm_compiler/CROSSTOOL +++ b/tools/arm_compiler/CROSSTOOL @@ -14,7 +14,7 @@ toolchain { compiler: "gcc" host_system_name: "armeabi-v7a" needsPic: true - supports_gold_linker: false + supports_gold_linker: true supports_incremental_linker: false supports_fission: false supports_interface_shared_objects: false