Merge branch 'master' into im_to_col

1 files changed, 14 insertions, 0 deletions

diff --git a/src/utilities/utilities.hpp b/src/utilities/utilities.hpp
index ad6edf3a..fae69b63 100644
--- a/src/utilities/utilities.hpp
+++ b/src/utilities/utilities.hpp
@@ -92,6 +92,14 @@ constexpr auto kArgDilationW = "dilationw";
 
 // The tuner-specific arguments in string form
 constexpr auto kArgFraction = "fraction";
+constexpr auto kArgHeuristicSelection = "heuristic";
+// PSO tuner-specific arguments in string form
+constexpr auto kArgPsoSwarmSize = "pso_swarm_size";
+constexpr auto kArgPsoInfGlobal = "pso_inf_global";
+constexpr auto kArgPsoInfLocal = "pso_inf_local";
+constexpr auto kArgPsoInfRandom = "pso_inf_random";
+// Annealing tuner-specific arguments in string form
+constexpr auto kArgAnnMaxTemp = "ann_max_temperature";
 
 // The common arguments in string form
 constexpr auto kArgPlatform = "platform";
@@ -197,7 +205,13 @@ struct Arguments {
   size_t ap_size = 1;
   size_t scalar_size = 1;
   // Tuner-specific arguments
+  size_t heuristic_selection = 0;
   double fraction = 1.0;
+  size_t pso_swarm_size = 8; 
+  double pso_inf_global = 0.3;
+  double pso_inf_local = 0.6;
+  double pso_inf_random = 0.1;
+  double ann_max_temperature = 1.0; // Is it a valid default value? 
   // Client-specific arguments
   int compare_clblas = 1;
   int compare_cblas = 1;