From 6f669f039fb74675b858bc3703295609a6a3e122 Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
Date: Tue, 26 Sep 2017 12:32:57 +0100
Subject: COMPMID-417: Add grouping in convolution layer

-Adds grouping support in convolution layer
-Adds Normalization layer node in graph
-Adds alexnet example
-Fixes FullyConnectedLayer output autoconfigure (works only for 1d batch
space)

Change-Id: I5bd75f9a8b08cfd68f7c34745150266c2bc4221f
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/89518
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
---
 utils/GraphTypePrinter.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 utils/TypePrinter.h      |  7 ++++++
 2 files changed, 70 insertions(+)
 create mode 100644 utils/GraphTypePrinter.h

(limited to 'utils')

diff --git a/utils/GraphTypePrinter.h b/utils/GraphTypePrinter.h
new file mode 100644
index 0000000000..be56d59853
--- /dev/null
+++ b/utils/GraphTypePrinter.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017 ARM Limited.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef __ARM_COMPUTE_TEST_GRAPH_TYPE_PRINTER_H__
+#define __ARM_COMPUTE_TEST_GRAPH_TYPE_PRINTER_H__
+
+#include "arm_compute/graph/Types.h"
+
+#include <ostream>
+#include <sstream>
+#include <string>
+
+namespace arm_compute
+{
+namespace graph
+{
+/** Formatted output of the @ref ConvolutionMethodHint type. */
+inline ::std::ostream &operator<<(::std::ostream &os, const ConvolutionMethodHint &conv_method)
+{
+    switch(conv_method)
+    {
+        case ConvolutionMethodHint::DIRECT:
+            os << "DIRECT";
+            break;
+        case ConvolutionMethodHint::GEMM:
+            os << "GEMM";
+            break;
+        default:
+            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
+    }
+
+    return os;
+}
+
+inline std::string to_string(const ConvolutionMethodHint &conv_method)
+{
+    std::stringstream str;
+    str << conv_method;
+    return str.str();
+}
+} // namespace graph
+} // namespace arm_compute
+#endif /* __ARM_COMPUTE_TEST_GRAPH_TYPE_PRINTER_H__ */
diff --git a/utils/TypePrinter.h b/utils/TypePrinter.h
index 758034884c..041ec1887a 100644
--- a/utils/TypePrinter.h
+++ b/utils/TypePrinter.h
@@ -264,6 +264,13 @@ inline std::string to_string(const arm_compute::NormalizationLayerInfo &info)
     return str.str();
 }
 
+/** Formatted output of @ref NormalizationLayerInfo. */
+inline ::std::ostream &operator<<(::std::ostream &os, const NormalizationLayerInfo &info)
+{
+    os << info.type();
+    return os;
+}
+
 /** Formatted output of the PoolingType type. */
 inline ::std::ostream &operator<<(::std::ostream &os, const PoolingType &pool_type)
 {
-- 
cgit v1.2.1