replace network::run() argument types to void* (#1223)

#1222
blue-oil · Oct 5, 2020 · 002f540 · 002f540
1 parent 8804c87
commit 002f540
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/blueoil/converter/templates/include/network.tpl.h b/blueoil/converter/templates/include/network.tpl.h
@@ -37,7 +37,7 @@ class SYM_PUBLIC Network
     void get_input_shape(int32_t *shape);
     void get_output_shape(int32_t *shape);
 
-    bool run(float *network_input, float *network_output);
+    bool run(void *network_input, void *network_output);
 
 private:
     // declarations

diff --git a/blueoil/converter/templates/src/network.tpl.cpp b/blueoil/converter/templates/src/network.tpl.cpp
@@ -273,7 +273,7 @@ void Network::get_output_shape(int32_t *shape)
   std::copy(output_shape, output_shape + output_rank, shape);
 }
 
-bool Network::run(float *network_input, float *network_output)
+bool Network::run(void *network_input, void *network_output)
 {
   struct convolution_parameters Conv2D_struct;
   struct binary_convolution_parameters binConv2D_struct;
@@ -293,7 +293,8 @@ bool Network::run(float *network_input, float *network_output)
     {{- len -}},
     {%- endfor %}
   };
-  TensorView<{{ graph_input.dtype.cpptype() }}, MemoryLayout::{{ graph_input.dimension }}> {{ graph_input.name }}_output(network_input, {{ graph_input.name }}_shape);
+  TensorView<{{ graph_input.dtype.cpptype() }}, MemoryLayout::{{ graph_input.dimension }}> {{ graph_input.name }}_output(
+    reinterpret_cast<{{ graph_input.dtype.cpptype() }}*>(network_input), {{ graph_input.name }}_shape);
   {{ '\n' -}}
 
   {% for node in graph.non_variables -%}
@@ -334,7 +335,10 @@ bool Network::run(float *network_input, float *network_output)
 
   // TODO: support multiple output
   {% for out_k in graph_output.output_ops.keys() -%}
-  std::copy({{ graph_output.name }}_{{ out_k }}.data(), {{ graph_output.name }}_{{ out_k }}.data() + {{ graph_output.view.size_in_words_as_cpp }}, network_output);
+  std::copy(
+    {{ graph_output.name }}_{{ out_k }}.data(), 
+    {{ graph_output.name }}_{{ out_k }}.data() + {{ graph_output.view.size_in_words_as_cpp }}, 
+    reinterpret_cast<decltype({{ graph_output.name }}_{{ out_k }}.data())>(network_output));
   {% endfor -%}
 
   return true;

diff --git a/blueoil/converter/templates/src/network_c_interface.cpp b/blueoil/converter/templates/src/network_c_interface.cpp
@@ -52,7 +52,7 @@ extern "C" __attribute__ ((visibility ("default"))) void network_get_output_shap
   nn->get_output_shape(shape);
 }
 
-extern "C" __attribute__ ((visibility ("default"))) void network_run(Network *nn, float *input, float *output)
+extern "C" __attribute__ ((visibility ("default"))) void network_run(Network *nn, void *input, void *output)
 {
   nn->run(input, output);
 }