From db8f40b00a5acef2b9d2c1cb0ab5f8dfc574fdbe Mon Sep 17 00:00:00 2001
From: walragatver <toshalagrawal38@gmail.com>
Date: Thu, 15 Aug 2019 02:30:23 +0530
Subject: [PATCH] Move more layers to `MoreTypes`.

---
 src/mlpack/methods/ann/layer/layer_types.hpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/mlpack/methods/ann/layer/layer_types.hpp b/src/mlpack/methods/ann/layer/layer_types.hpp
index d097c8a4ec..33e4bb6991 100644
--- a/src/mlpack/methods/ann/layer/layer_types.hpp
+++ b/src/mlpack/methods/ann/layer/layer_types.hpp
@@ -164,6 +164,15 @@ template<typename InputDataType,
 class MultiplyMerge;
 
 using MoreTypes = boost::variant<
+        Recurrent<arma::mat, arma::mat>*,
+        RecurrentAttention<arma::mat, arma::mat>*,
+        ReinforceNormal<arma::mat, arma::mat>*,
+        Reparametrization<arma::mat, arma::mat>*,
+        Select<arma::mat, arma::mat>*,
+        Sequential<arma::mat, arma::mat, false>*,
+        Sequential<arma::mat, arma::mat, true>*,
+        Subview<arma::mat, arma::mat>*,
+        VRClassReward<arma::mat, arma::mat>*,
         VirtualBatchNorm<arma::mat, arma::mat>*
 >;
 
@@ -218,17 +227,6 @@ using LayerTypes = boost::variant<
     MultiplyMerge<arma::mat, arma::mat>*,
     NegativeLogLikelihood<arma::mat, arma::mat>*,
     PReLU<arma::mat, arma::mat>*,
-    Recurrent<arma::mat, arma::mat>*,
-    // TODO find workaround to support more than 50 types
-    // as boost::variant can only be used for up to 50 types.
-    // RecurrentAttention<arma::mat, arma::mat>*,
-    ReinforceNormal<arma::mat, arma::mat>*,
-    Reparametrization<arma::mat, arma::mat>*,
-    Select<arma::mat, arma::mat>*,
-    Sequential<arma::mat, arma::mat, false>*,
-    Sequential<arma::mat, arma::mat, true>*,
-    Subview<arma::mat, arma::mat>*,
-    // VRClassReward<arma::mat, arma::mat>*,
     MoreTypes,
     CustomLayers*...
 >;