Merge branch 'bug-in-opencl-runtime' into 'm0.11'

Fix some bugs.

See merge request !1127

mace/core/net_def_adapter.cc

@@ -50,15 +50,6 @@ std::string TransformedName(const std::string &input_name,
   return ss.str();
 }
 
-#ifdef MACE_ENABLE_OPENCL
-bool TransformRequiredOp(const std::string &op_type) {
-  static const std::unordered_set<std::string> kNoTransformOp = {
-      "Shape", "InferConv2dShape"
-  };
-  return kNoTransformOp.count(op_type) == 0;
-}
-#endif  // MACE_ENABLE_OPENCL
-
 void BuildTransposeOpDef(
     const std::string &input_name,
     const std::string &output_name,
@@ -514,8 +505,6 @@ MaceStatus NetDefAdapter::AdaptMemoryType(
   // (only support one kind of memory type for multiple outputs)
   op_registry_->GetInOutMemoryTypes(op_def->type(), context);
 #ifdef MACE_ENABLE_OPENCL
-  // if op is memory-unused op, no transformation
-  if (TransformRequiredOp(op_def->type())) {
   int input_size = op_def->input_size();
   for (int i = 0; i < input_size; ++i) {
     if (output_map->count(op_def->input(i)) == 0) {
@@ -585,7 +574,6 @@ MaceStatus NetDefAdapter::AdaptMemoryType(
       op_def->set_input(i, transformed_name);
     }
   }
-  }
 #else
   MACE_UNUSED(output_map);
   MACE_UNUSED(tensor_shape_map);

mace/ops/matmul.cc

@@ -602,14 +602,6 @@ void RegisterMatMul(OpRegistryBase *op_registry) {
                    DeviceType::CPU, uint8_t);
 #endif  // MACE_ENABLE_QUANTIZE
 
-#ifdef MACE_ENABLE_OPENCL
-  MACE_REGISTER_OP(op_registry, "MatMul", MatMulOp,
-                   DeviceType::GPU, float);
-
-  MACE_REGISTER_OP(op_registry, "MatMul", MatMulOp,
-                   DeviceType::GPU, half);
-#endif  // MACE_ENABLE_OPENCL
-
 #if defined(MACE_ENABLE_NEON) && defined(__ANDROID__)
   MACE_REGISTER_OP(op_registry, "MatMul", MatMulOp,
                    DeviceType::CPU, float16_t);

mace/tools/git/gen_version_source.sh

@@ -28,7 +28,7 @@ fi
 
 mkdir -p $OUTPUT_DIR
 
-GIT_VERSION=$(git --git-dir=${MACE_SOURCE_DIR}/.git --work-tree=${MACE_SOURCE_DIR} describe --long --tags)
+GIT_VERSION=$(git --git-dir=${MACE_SOURCE_DIR}/.git --work-tree=${MACE_SOURCE_DIR} describe --long --tags --abbrev=7)
 if [[ $? != 0 ]]; then
   GIT_VERSION=unknown
 else