Merge branch 'cpu' into 'master'

use .pic.a for local runtime.

See merge request !233

mace/kernels/opencl/buffer_to_image.cc

@@ -87,7 +87,6 @@ void BufferToImageFunctor<DeviceType::OPENCL, T>::operator()(Tensor *buffer,
   }
   b2f_kernel.setArg(idx++, *(static_cast<cl::Image2D *>(image->buffer())));
 
-  const uint32_t kwg_size = runtime->GetKernelMaxWorkGroupSize(b2f_kernel);
   const std::vector<uint32_t> lws = {16, 64};
   cl::Event event;
   cl_int error = runtime->command_queue().enqueueNDRangeKernel(

tools/export_lib.sh

@@ -94,10 +94,18 @@ merge_libs()
     lib_dir=${lib_dir#//}
     lib_name_prefix=lib`echo ${lib_target} | cut -d: -f2`
     bin_path="${MACE_SOURCE_DIR}/bazel-bin/${lib_dir}/${lib_name_prefix}"
-    if [ -f "${bin_path}.a" ]; then
-      bin_path="${bin_path}.a"
+    if [ x"${RUNTIME}" = x"local" ]; then
+      if [ -f "${bin_path}.pic.a" ]; then
+        bin_path="${bin_path}.pic.a"
+      else
+        bin_path="${bin_path}.pic.lo"
+      fi
     else
-      bin_path="${bin_path}.lo"
+      if [ -f "${bin_path}.a" ]; then
+        bin_path="${bin_path}.a"
+      else
+        bin_path="${bin_path}.lo"
+      fi
     fi
     echo "addlib ${bin_path}" >> ${LIBMACE_TEMP_DIR}/${CREATE_LIB_NAME}.mri || exit 1
   done