Merge branch 'development' into triangular_solvers

1 files changed, 19 insertions, 13 deletions

diff --git a/src/database/database.cpp b/src/database/database.cpp
index aff6490d..f1d1dc66 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -67,7 +67,7 @@ const std::unordered_map<std::string, std::string> Database::kVendorNames{
 
 // Constructor, computing device properties and populating the parameter-vector from the database.
 // This takes an optional overlay database in case of custom tuning or custom kernels.
-Database::Database(const Device &device, const std::vector<std::string> &kernels,
+Database::Database(const Device &device, const std::string &kernel_name,
                    const Precision precision, const std::vector<const DatabaseEntry*> &overlay):
   parameters_(std::make_shared<Parameters>()) {
 
@@ -83,20 +83,17 @@ Database::Database(const Device &device, const std::vector<std::string> &kernels
     }
   }
 
-  // Iterates over all kernels to include, and retrieves the parameters for each of them
-  for (auto &kernel: kernels) {
-    auto search_result = ParametersPtr{};
-
-    for (auto &db: { database, overlay}) {
-      search_result = Search(kernel, device_type, device_vendor, device_name, precision, db);
-      if (search_result) {
-        parameters_->insert(search_result->begin(), search_result->end());
-        break;
-      }
+  // Searches potentially multiple databases
+  auto search_result = ParametersPtr{};
+  for (auto &db: { overlay, database}) {
+    search_result = Search(kernel_name, device_type, device_vendor, device_name, precision, db);
+    if (search_result) {
+      parameters_->insert(search_result->begin(), search_result->end());
+      break;
     }
-
-    if (!search_result) { throw RuntimeErrorCode(StatusCode::kDatabaseError); }
   }
+
+  if (!search_result) { throw RuntimeErrorCode(StatusCode::kDatabaseError); }
 }
 
 // =================================================================================================
@@ -110,6 +107,15 @@ std::string Database::GetDefines() const {
   return defines;
 }
 
+// Retrieves the names of all the parameters
+std::vector<std::string> Database::GetParameterNames() const {
+  auto parameter_names = std::vector<std::string>();
+  for (auto &parameter: *parameters_) {
+    parameter_names.push_back(parameter.first);
+  }
+  return parameter_names;
+}
+
 // =================================================================================================
 
 // Searches a particular database for the right kernel and precision