Soft backend: fully connected operation (#836)

Add implementation of fully connected operation

Signed-off-by: Efimov Alexander <a.efimov@samsung.com>

diff --git a/contrib/nnc/libs/backend/soft/include/cpp_operations.def b/contrib/nnc/libs/backend/soft/include/cpp_operations.def
index 2387ed3..9c9d18f 100644 (file)
--- a/contrib/nnc/libs/backend/soft/include/cpp_operations.def
+++ b/contrib/nnc/libs/backend/soft/include/cpp_operations.def
@@ -206,7 +206,16 @@ void avgPool(Tensor &out, const char *params, const Tensor &in)
 
 void fullConnect(Tensor &out, const char *params, const Tensor &in)
 {
-  // TODO call actual function
+  const float *input = in.getData();
+  Dims<4> input_d = shapeToDims(in.getShape());
+  Kernel kernel = deserializeKernel(params);
+  Shape out_s = deserializeShape(params);
+
+  out.reShape(out_s);
+
+  FullyConnected(input, input_d,
+                 kernel.data, kernel.dims,
+                 out.getData(), shapeToDims(out_s));
 }
 
 void cappedRelu(Tensor &out, const char *params, const Tensor &in)

diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_common_funcs.def b/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_common_funcs.def
index 8cd6b7f..b4a17c9 100644 (file)
--- a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_common_funcs.def
+++ b/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_common_funcs.def
@@ -221,4 +221,3 @@ void Gemm(const Eigen::MatrixBase<Lhs>& lhs, const Eigen::MatrixBase<Rhs>& rhs,
     result->noalias() = lhs * rhs;
   }
 }
-

diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_fully_connected.def b/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_fully_connected.def
index 8b13789..2690896 100644 (file)
--- a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_fully_connected.def
+++ b/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_fully_connected.def
@@ -1 +1,29 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+inline void FullyConnected(const float* input_data, const Dims<4>& input_dims,
+                           const float* weights_data,
+                           const Dims<4>& weights_dims,
+                           float* output_data, const Dims<4>& output_dims) {
+  const int input_rows = ArraySize(weights_dims, 0);
+  const auto input_matrix_map =
+      MapAsMatrixWithGivenNumberOfRows(input_data, input_dims, input_rows);
+  const auto filter_matrix_map =
+      MapAsMatrixWithFirstDimAsRows(weights_data, weights_dims);
+  auto output_matrix_map =
+      MapAsMatrixWithFirstDimAsRows(output_data, output_dims);
+
+  Gemm(filter_matrix_map.transpose(), input_matrix_map, &output_matrix_map);
+}