Merge branch 'onnx' into 'master'

Fix onnx depthspace

See merge request deep-computing/mace!1272

mace/core/net_def_adapter.cc

@@ -347,7 +347,8 @@ MaceStatus NetDefAdapter::AdaptDevice(OpConditionContext *context,
     if (device_type == target_device_type) {
       context->set_device(target_device);
     } else {
-      LOG(INFO) << "Op " << op_def->name() << " fall back to CPU";
+      LOG(INFO) << "Op " << op_def->name() << "(" << op_def->type() << ")"
+                << " fall back to CPU";
     }
   }
   op_def->set_device_type(device_type);

third_party/third_party.cmake

@@ -51,7 +51,10 @@ include(${PROJECT_SOURCE_DIR}/third_party/opencl-headers/opencl-headers.cmake)
 include(${PROJECT_SOURCE_DIR}/third_party/protobuf/protobuf.cmake)
 include(${PROJECT_SOURCE_DIR}/third_party/tflite/tflite.cmake)
 include(${PROJECT_SOURCE_DIR}/third_party/caffe/caffe.cmake)
-include(${PROJECT_SOURCE_DIR}/third_party/rpcmem/rpcmem.cmake)
+
+if(MACE_ENABLE_RPCMEM)
+  include(${PROJECT_SOURCE_DIR}/third_party/rpcmem/rpcmem.cmake)
+endif(MACE_ENABLE_RPCMEM)
 
 if(MACE_ENABLE_HEXAGON_DSP)
   include(${PROJECT_SOURCE_DIR}/third_party/nnlib/nnlib.cmake)

tools/python/transform/onnx_converter.py

@@ -806,17 +806,20 @@ class OnnxConverter(base_converter.ConverterInterface):
 
     def convert_depth_space(self, node):
         op = self.convert_general_op(node)
-        if op.type == OnnxOpType.DepthToSpace.name:
+        if node.op_type == OnnxOpType.DepthToSpace.name:
             op.type = MaceOp.DepthToSpace.name
         else:
             op.type = MaceOp.SpaceToDepth.name
-        mace_check(('block_size' in node.attrs),
-                   "depth to space op should have block size attribute.")
-        block_size = node.attrs['block_size']
+        mace_check(('blocksize' in node.attrs),
+                   "DepthToSpace/SpaceToDepth must have blocksize attribute.")
+        block_size = node.attrs['blocksize']
         size_arg = op.arg.add()
         size_arg.name = MaceKeyword.mace_space_depth_block_size_str
         size_arg.i = block_size
 
+        if 'mode' in node.attrs:
+            mace_check(node.attrs['mode'] == 'DCR', "Only supports DCR mode.")
+
     def convert_dim_range(self, node):
         op = self.convert_general_op(node)
         op.type = MaceOp.Slice.name