Build Fixed, Nice way to avoid hidden files

Style Fixed

Clean Up

Why is config there even though I did a rebase

Add data split (internal), need implementation only for field type

Style Fixed

need to seperate the declaration

Fixed

style fixes, commits also need clean up

Remove template from Augmentation

Fixed the duplicacy error

Add mat type support (there is invalid read)

Mat type gives invalid read

Hmm,

style fixes, commits also need clean up

Typo -> invalid read -> Fixed

Remove extra lines

Rename cell to image

Style Fixes and use mlpack URL

Make augmentation case insensitive

Allow multiple Resize Transform

Add unknown augmentation warning

Style Fixes and boundary checks

Increase dataset size, adjust comments, change URL

Style Fixes and boundary checks

Author: kartikdutt18

augmentation/augmentation.hpp

@@ -11,53 +11,74 @@
  */
 
 #include <mlpack/methods/ann/layer/bilinear_interpolation.hpp>
+#include <mlpack/core/util/to_lower.hpp>
 #include <boost/regex.hpp>
 
 #ifndef MODELS_AUGMENTATION_HPP
 #define MODELS_AUGMENTATION_HPP
 
 /**
- * Augmentation class used to perform augmentations / transform the data.
+ * Augmentation class used to perform augmentations by transforming the data.
  * For the list of supported augmentation, take a look at our wiki page.
  *
  * @code
- * Augmentation<> augmentation({"horizontal-flip", "resize = (224, 224)"}, 0.2);
+ * Augmentation augmentation({"horizontal-flip", "resize = (224, 224)"}, 0.2);
  * augmentation.Transform(dataloader.TrainFeatures);
  * @endcode
- * 
- * @tparam DatasetType Datatype on which augmentation will be done.
  */
-template<typename DatasetType = arma::mat>
 class Augmentation
 {
  public:
   //! Create the augmentation class object.
-  Augmentation();
+  Augmentation() :
+      augmentations(std::vector<std::string>()),
+      augmentationProbability(0.2)
+  {
+    // Nothing to do here.
+  }
 
   /**
    * Constructor for augmentation class.
    *
    * @param augmentations List of strings containing one of the supported
-   *                     augmentations.
+   *                      augmentations.
    * @param augmentationProbability Probability of applying augmentation on
    *                                the dataset.
    *                                NOTE : This doesn't apply to augmentations
    *                                such as resize.
    */
   Augmentation(const std::vector<std::string>& augmentations,
-               const double augmentationProbability);
+               const double augmentationProbability) :
+               augmentations(augmentations),
+               augmentationProbability(augmentationProbability)
+  {
+    // Convert strings to lower case.
+    for (size_t i = 0; i < augmentations.size(); i++)
+      mlpack::util::ToLower(augmentations[i], this->augmentations[i]);
+
+    // Sort the vector to place resize parameter to the front of the string.
+    // This prevents constant lookups for resize.
+    sort(this->augmentations.begin(), this->augmentations.end(), [](
+        std::string& str1, std::string& str2)
+        {
+          return str1.find("resize") != std::string::npos;
+        });
+  }
 
   /**
    * Applies augmentation to the passed dataset.
    *
+   * @tparam DatasetType Datatype on which augmentation will be done.
+   * 
    * @param dataset Dataset on which augmentation will be applied.
    * @param datapointWidth Width of a single data point i.e.
-   *                    Since each column represents a seperate data
-   *                    point.
+   *                       Since each column represents a seperate data
+   *                       point.
    * @param datapointHeight Height of a single data point.
-   * @param datapointDepth Depth of a single data point. For 2-dimensional
-   *                     data point, set it to 1. Defaults to 1.
+   * @param datapointDepth Depth of a single data point. For one 2-dimensional
+   *                       data point, set it to 1. Defaults to 1.
    */
+  template<typename DatasetType>
   void Transform(DatasetType& dataset,
                  const size_t datapointWidth,
                  const size_t datapointHeight,
@@ -66,29 +87,28 @@ class Augmentation
   /**
    * Applies resize transform to the entire dataset.
    *
+   * @tparam DatasetType Datatype on which augmentation will be done.
+   * 
    * @param dataset Dataset on which augmentation will be applied.
    * @param datapointWidth Width of a single data point i.e.
-   *                    Since each column represents a seperate data
-   *                    point.
+   *                       Since each column represents a seperate data
+   *                       point.
    * @param datapointHeight Height of a single data point.
-   * @param datapointDepth Depth of a single data point. For 2-dimensional
-   *                     data point, set it to 1. Defaults to 1.
+   * @param datapointDepth Depth of a single data point. For one 2-dimensional
+   *                       data point, set it to 1. Defaults to 1.
    * @param augmentation String containing the transform.
    */
+  template<typename DatasetType>
   void ResizeTransform(DatasetType& dataset,
                        const size_t datapointWidth,
                        const size_t datapointHeight,
                        const size_t datapointDepth,
                        const std::string& augmentation);
 
  private:
-  /**
-   * Initializes augmentation map for the class.
-   */
-  void InitializeAugmentationMap();
-
   /**
    * Function to determine if augmentation has Resize function.
+   *
    * @param augmentation Optional argument to check if a string has
    *                     resize substring.
    */
@@ -118,11 +138,10 @@ class Augmentation
     if (!HasResizeParam())
       return;
 
-
     outWidth = 0;
     outHeight = 0;
 
-    // Use regex to find one / two  numbers. If only one provided
+    // Use regex to find one or two numbers. If only one provided
     // set output width equal to output height.
     boost::regex regex{"[0-9]+"};
 
@@ -151,16 +170,12 @@ class Augmentation
     }
   }
 
-  //! Locally held augmentations / transforms that need to be applied.
+  //! Locally held augmentations and transforms that need to be applied.
   std::vector<std::string> augmentations;
 
   //! Locally held value of augmentation probability.
   double augmentationProbability;
 
-  //! Locally help map for mapping functions and strings.
-  std::unordered_map<std::string, void(*)(DatasetType&,
-      size_t, size_t, size_t, std::string&)> augmentationMap;
-
   // The dataloader class should have access to internal functions of
   // the dataloader.
   template<typename DatasetX, typename DatasetY, class ScalerType>

augmentation/augmentation_impl.hpp

@@ -9,74 +9,51 @@
  * 3-clause BSD license along with mlpack.  If not, see
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
+
 // Incase it has not been included already.
 #include "augmentation.hpp"
 
 #ifndef MODELS_AUGMENTATION_IMPL_HPP
 #define MODELS_AUGMENTATION_IMPL_HPP
 
 template<typename DatasetType>
-Augmentation<DatasetType>::Augmentation() :
-    augmentations(std::vector<std::string>()),
-    augmentationProbability(0.2)
-{
-  // Nothing to do here.
-}
-
-template<typename DatasetType>
-Augmentation<DatasetType>::Augmentation(
-    const std::vector<std::string>& augmentations,
-    const double augmentationProbability) :
-    augmentations(augmentations),
-    augmentationProbability(augmentationProbability)
+void Augmentation::Transform(DatasetType& dataset,
+                             const size_t datapointWidth,
+                             const size_t datapointHeight,
+                             const size_t datapointDepth)
 {
-  // Sort the vector to place resize parameter to the front of the string.
-  // This prevents constant lookups for resize.
-  sort(this->augmentations.begin(), this->augmentations.end(), [](
-      std::string& str1, std::string& str2)
-      {
-        return str1.find("resize") != std::string::npos;
-      });
+  // Initialize the augmentation map.
+  std::unordered_map<std::string, void(*)(DatasetType&,
+       size_t, size_t, size_t, std::string&)> augmentationMap;
 
-  // Fill augmentation map with supported augmentations other than resize.
-  InitializeAugmentationMap();
-}
-
-template<typename DatasetType>
-void Augmentation<DatasetType>::Transform(DatasetType& dataset,
-                                          const size_t datapointWidth,
-                                          const size_t datapointHeight,
-                                          const size_t datapointDepth)
-{
-  size_t i = 0;
-  if (this->HasResizeParam())
-  {
-    this->ResizeTransform(dataset, datapointWidth, datapointHeight,
-        datapointDepth, augmentations[0]);
-    i++;
-  }
-
-  for (; i < augmentations.size(); i++)
+  for (size_t i = 0; i < augmentations.size(); i++)
   {
     if (augmentationMap.count(augmentations[i]))
     {
       augmentationMap[augmentations[i]](dataset, datapointWidth,
         datapointHeight, datapointDepth, augmentations[i]);
     }
+    else if (this->HasResizeParam(augmentations[i]))
+    {
+      this->ResizeTransform(dataset, datapointWidth, datapointHeight,
+        datapointDepth, augmentations[i]);
+    }
+    else
+    {
+      mlpack::Log::Warn << "Unknown augmentation : \'" <<
+          augmentations[i] << "\' not found!" << std::endl;
+    }
   }
 }
 
 template<typename DatasetType>
-void Augmentation<DatasetType>::ResizeTransform(
+void Augmentation::ResizeTransform(
     DatasetType& dataset,
     const size_t datapointWidth,
     const size_t datapointHeight,
     const size_t datapointDepth,
     const std::string& augmentation)
 {
-  if (!this->HasResizeParam(augmentation))
-    return;
-
   size_t outputWidth = 0, outputHeight = 0;
 
   // Get output width and output height.
@@ -88,16 +65,9 @@ void Augmentation<DatasetType>::ResizeTransform(
       datapointWidth, datapointHeight, outputWidth, outputHeight,
       datapointDepth);
 
-  // Not sure how to avoid a copy here.
   DatasetType output;
   resizeLayer.Forward(dataset, output);
   dataset = std::move(output);
 }
 
-template<typename DatasetType>
-void Augmentation<DatasetType>::InitializeAugmentationMap()
-{
-  // Fill the map here.
-}
-
 #endif