[coco] Add FeatureShape constructor with explicit arguments (#2592)

This commit adds a FeatureShape constructor which allows users to
specify batch/depth/height/width explicitly.

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

diff --git a/contrib/coco/core/include/coco/IR/FeatureShape.h b/contrib/coco/core/include/coco/IR/FeatureShape.h
index 5ea0801..893ca1d 100644 (file)
--- a/contrib/coco/core/include/coco/IR/FeatureShape.h
+++ b/contrib/coco/core/include/coco/IR/FeatureShape.h
@@ -36,6 +36,12 @@ public:
     // DO NOTHING
   }
 
+  FeatureShape(uint32_t batch, uint32_t depth, uint32_t height, uint32_t width)
+      : Shape{depth, height, width}, _batch{batch}
+  {
+    // DO NOTHING
+  }
+
   FeatureShape(const nncc::core::ADT::feature::Shape &shape) : Shape{shape}, _batch{1}
   {
     // DO NOTHING

diff --git a/contrib/coco/core/src/IR/FeatureShape.test.cpp b/contrib/coco/core/src/IR/FeatureShape.test.cpp
new file mode 100644 (file)
index 0000000..ceeab02
--- /dev/null
+++ b/contrib/coco/core/src/IR/FeatureShape.test.cpp
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+#include "coco/IR/FeatureShape.h"
+
+#include <gtest/gtest.h>
+
+TEST(FeatureShapeTest, constructor_with_4_arguments)
+{
+  const coco::FeatureShape shape{1, 2, 3, 4};
+
+  ASSERT_EQ(shape.batch(), 1);
+  ASSERT_EQ(shape.depth(), 2);
+  ASSERT_EQ(shape.height(), 3);
+  ASSERT_EQ(shape.width(), 4);
+}