[Container] Add more constructors for MemRef and Img container.

Author: zhanghb97

include/Interface/buddy/core/Container.h

@@ -33,10 +33,11 @@ template <typename T, size_t N> class MemRef {
 public:
   // Constructor from shape.
   MemRef(intptr_t sizes[N], T init = T(0));
+  MemRef(std::vector<size_t> sizes, T init = T(0));
   // Constructor from data.
   MemRef(const T *data, intptr_t sizes[N], intptr_t offset = 0);
   // Constructor from a unique_ptr, taking over.
-  MemRef(std::unique_ptr<T>& uptr, intptr_t sizes[N], intptr_t offset = 0);
+  MemRef(std::unique_ptr<T> &uptr, intptr_t sizes[N], intptr_t offset = 0);
   // Copy constructor.
   MemRef(const MemRef<T, N> &other);
   // Copy assignment operator.

include/Interface/buddy/core/ImageContainer.h

@@ -26,9 +26,12 @@
 // Image container.
 // - T represents the type of the elements.
 // - N represents the number of dimensions.
+// - image represents the OpenCV Mat object.
+// - norm indicates whether to perform normalization, and the normalization is
+//   disabled by default.
 template <typename T, size_t N> class Img : public MemRef<T, N> {
 public:
-  Img(cv::Mat image);
+  Img(cv::Mat image, bool norm = false);
 };
 
 #include "Interface/core/ImageContainer.cpp"

lib/Interface/core/Container.cpp

@@ -44,6 +44,21 @@ MemRef<T, N>::MemRef(intptr_t sizes[N], T init) {
   std::fill(aligned, aligned + size, init);
 }
 
+template <typename T, std::size_t N>
+MemRef<T, N>::MemRef(std::vector<size_t> sizes, T init) {
+  if (sizes.size() != N) {
+    throw std::runtime_error("Invalid number of dimensions.");
+  }
+  for (size_t i = 0; i < N; i++) {
+    this->sizes[i] = sizes[i];
+  }
+  setStrides();
+  size = product(this->sizes);
+  allocated = new T[size];
+  aligned = allocated;
+  std::fill(aligned, aligned + size, init);
+}
+
 // MemRef Array Constructor.
 // Construct a MemRef object from the data pointer, sizes, and offset.
 // The default offset is 0.
@@ -210,7 +225,7 @@ size_t MemRef<T, N>::product(intptr_t sizes[N]) const {
   return size;
 }
 template <typename T, size_t N>
-MemRef<T, N>::MemRef(std::unique_ptr<T>& uptr, intptr_t *sizes,
+MemRef<T, N>::MemRef(std::unique_ptr<T> &uptr, intptr_t *sizes,
                      intptr_t offset) {
   if (!uptr)
     assert(0 && "Taking over an empty unique pointer.");

lib/Interface/core/ImageContainer.cpp

@@ -24,7 +24,8 @@
 #include <cassert>
 
 // Image Constructor from OpenCV Mat.
-template <typename T, size_t N> Img<T, N>::Img(cv::Mat image) : MemRef<T, N>() {
+template <typename T, size_t N>
+Img<T, N>::Img(cv::Mat image, bool norm) : MemRef<T, N>() {
   if (image.channels() == 1) {
     assert((N == 2) &&
            "Input image type does not match the selected dimension.");
@@ -41,9 +42,36 @@ template <typename T, size_t N> Img<T, N>::Img(cv::Mat image) : MemRef<T, N>() {
       }
     }
     this->setStrides();
+  }
+  // Use NHWC layout by default.
+  else if (image.channels() == 3) {
+    assert((N == 4) &&
+           "Input image type does not match the selected dimension.");
+    this->sizes[0] = 1;
+    this->sizes[1] = image.rows;
+    this->sizes[2] = image.cols;
+    this->sizes[3] = 3;
+    this->size = image.rows * image.cols * 3;
+    this->allocated = new T[this->size];
+    this->aligned = this->allocated;
+    int k = 0;
+    for (int i = 0; i < image.rows; i++) {
+      for (int j = 0; j < image.cols; j++) {
+        for (int color = 0; color < 3; color++) {
+          // Reorder to RGB layout.
+          if (norm) {
+            this->aligned[k] = (T)image.at<cv::Vec3b>(i, j)[2 - color] / 255;
+          } else {
+            this->aligned[k] = (T)image.at<cv::Vec3b>(i, j)[2 - color];
+          }
+          k++;
+        }
+      }
+    }
+    this->setStrides();
   } else {
     // TODO: Add more image channels in this constructor.
-    assert((N != 2) && "This image channels is not supported.");
+    std::cerr << "This image channels is not supported." << std::endl;
   }
 }