From 822f7a4d3970ce6ceab5876f3bf4551369b8e324 Mon Sep 17 00:00:00 2001
From: liuqi <liuqi10@xiaomi.com>
Date: Thu, 1 Feb 2018 19:43:59 +0800
Subject: [PATCH] Support half-type const tensor.

---
 mace/core/serializer.cc          |  4 ++++
 mace/ops/buffer_to_image_test.cc | 41 +++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/mace/core/serializer.cc b/mace/core/serializer.cc
index 5d24e9b7..6e96f34c 100644
--- a/mace/core/serializer.cc
+++ b/mace/core/serializer.cc
@@ -23,6 +23,10 @@ unique_ptr<Tensor> Serializer::Deserialize(const ConstTensor &proto,
   tensor->Resize(dims);
 
   switch (proto.data_type()) {
+    case DT_HALF:
+      tensor->Copy<half>(reinterpret_cast<const half*>(proto.data()),
+                         proto.data_size());
+      break;
     case DT_FLOAT:
       tensor->Copy<float>(reinterpret_cast<const float *>(proto.data()),
                           proto.data_size());
diff --git a/mace/ops/buffer_to_image_test.cc b/mace/ops/buffer_to_image_test.cc
index 760103d0..34c7d16f 100644
--- a/mace/ops/buffer_to_image_test.cc
+++ b/mace/ops/buffer_to_image_test.cc
@@ -4,7 +4,6 @@
 
 #include "gtest/gtest.h"
 #include "mace/ops/ops_test_util.h"
-#include "mace/kernels/opencl/helper.h"
 
 using namespace mace;
 
@@ -130,3 +129,43 @@ void TestDiffTypeBidirectionTransform(const int type, const std::vector<index_t>
 TEST(BufferToImageTest, ArgFloatToHalfSmall) {
   TestDiffTypeBidirectionTransform<DeviceType::OPENCL, half>(kernels::ARGUMENT, {11});
 }
+
+template<DeviceType D, typename T>
+void TestStringHalfBidirectionTransform(const int type,
+                                        const std::vector<index_t> &input_shape,
+                                        const unsigned char *input_data) {
+  OpsTestNet net;
+  OpDefBuilder("BufferToImage", "BufferToImageTest")
+      .Input("Input")
+      .Output("B2IOutput")
+      .AddIntArg("buffer_type", type)
+      .AddIntArg("T", DataTypeToEnum<T>::value)
+      .Finalize(net.NewOperatorDef());
+
+  const half *h_data = reinterpret_cast<const half*>(input_data);
+
+  net.AddInputFromArray<D, half>("Input", input_shape, std::vector<half>(h_data, h_data+2));
+
+  // Run
+  net.RunOp(D);
+
+  OpDefBuilder("ImageToBuffer", "ImageToBufferTest")
+      .Input("B2IOutput")
+      .Output("I2BOutput")
+      .AddIntArg("buffer_type", type)
+      .AddIntArg("T", DataTypeToEnum<T>::value)
+      .Finalize(net.NewOperatorDef());
+
+  // Run
+  net.RunOp(D);
+
+  // Check
+  ExpectTensorNear<half>(*net.GetOutput("Input"), *net.GetOutput("I2BOutput"), 1e-2);
+}
+
+TEST(BufferToImageTest, ArgStringHalfToHalfSmall) {
+  const unsigned char input_data[] = {0xCD, 0x3C, 0x33, 0x40,};
+  TestStringHalfBidirectionTransform<DeviceType::OPENCL, half>(kernels::ARGUMENT,
+                                                               {2},
+                                                               input_data);
+}
-- 
GitLab