Introduce 'tensor::Diff' class (#1422)

This commit extracts general 'tensor::Diff' clss from
'TfLiteTensorDiff'.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/include/support/tflite/Diff.h b/include/support/tflite/Diff.h
index 2411772..ebc3ac3 100644 (file)
--- a/include/support/tflite/Diff.h
+++ b/include/support/tflite/Diff.h
@@ -20,6 +20,7 @@
 #include "tensorflow/contrib/lite/interpreter.h"
 
 #include "util/tensor/Index.h"
+#include "util/tensor/Diff.h"
 
 #include "support/tflite/TensorView.h"
 
@@ -28,13 +29,9 @@
 
 // NOTE The code below is subject to change.
 // TODO Introduce namespaces
-struct TfLiteTensorDiff
+struct TfLiteTensorDiff : public nnfw::util::tensor::Diff<float>
 {
-  nnfw::util::tensor::Index index;
-  float expected;
-  float obtained;
-
-  TfLiteTensorDiff(const nnfw::util::tensor::Index &i) : index(i)
+  TfLiteTensorDiff(const nnfw::util::tensor::Index &i) : nnfw::util::tensor::Diff<float>{i}
   {
     // DO NOTHING
   }

diff --git a/include/util/tensor/Diff.h b/include/util/tensor/Diff.h
new file mode 100644 (file)
index 0000000..5839938
--- /dev/null
+++ b/include/util/tensor/Diff.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd. 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.
+ */
+
+#ifndef __NNFW_UTIL_TENSOR_DIFF_H__
+#define __NNFW_UTIL_TENSOR_DIFF_H__
+
+#include "util/tensor/Index.h"
+
+namespace nnfw
+{
+namespace util
+{
+namespace tensor
+{
+
+template<typename T> struct Diff
+{
+  Index index;
+
+  T expected;
+  T obtained;
+
+  Diff(const Index &i) : index(i)
+  {
+    // DO NOTHING
+  }
+};
+
+} // namespace tensor
+} // namespace util
+} // namespace nnfw
+
+#endif // __NNFW_UTIL_TENSOR_DIFF_H__