GPU: clean up and split qconfig header

Author: davidrohr

GPU/GPUTracking/Base/GPUParam.cxx

@@ -28,7 +28,7 @@ using namespace o2::gpu;
 #include <cstring>
 #include <tuple>
 
-#include "utils/qconfigrtc.h"
+#include "utils/qconfig_rtc.h"
 
 void GPUParam::SetDefaults(float solenoidBz, bool assumeConstantBz)
 {

GPU/GPUTracking/DataTypes/GPUConfigDump.cxx

@@ -29,7 +29,7 @@ namespace
 GPUSettingsStandalone configStandalone;
 std::vector<std::function<void()>> qprint_global;
 #define QCONFIG_PRINT
-#include "utils/qconfig.h"
+#include "utils/qconfig_internal.h"
 #undef QCONFIG_PRINT
 } // namespace
 

GPU/GPUTracking/Standalone/Benchmark/standalone.cxx

@@ -92,7 +92,7 @@ std::vector<GPUChainTracking::InOutMemory> ioMemEvents;
 
 int32_t ReadConfiguration(int argc, char** argv)
 {
-  int32_t qcRet = qConfigParse(argc, (const char**)argv);
+  int32_t qcRet = qConfig::qConfigParse(argc, (const char**)argv);
   if (qcRet) {
     if (qcRet != qConfig::qcrHelp) {
       printf("Error parsing command line parameters\n");
@@ -107,7 +107,7 @@ int32_t ReadConfiguration(int argc, char** argv)
   }
   if (configStandalone.printSettings > 1) {
     printf("Config Dump before ReadConfiguration\n");
-    qConfigPrint();
+    qConfig::qConfigPrint();
   }
   if (configStandalone.proc.debugLevel == -1) {
     configStandalone.proc.debugLevel = 0;
@@ -295,7 +295,7 @@ int32_t ReadConfiguration(int argc, char** argv)
   }
   if (configStandalone.printSettings > 1) {
     printf("Config Dump after ReadConfiguration\n");
-    qConfigPrint();
+    qConfig::qConfigPrint();
   }
 
   return (0);

GPU/GPUTracking/utils/qconfig.cxx

@@ -22,39 +22,16 @@
 #include <tuple>
 #include "qconfig.h"
 #include "qconfig_helpers.h"
+#include "qconfig_internal_helpers.h"
 
 // Create config instances
 #define QCONFIG_PARSER_CXX
 #define QCONFIG_INSTANCE
-#include "qconfig.h"
+#include "qconfig_internal.h"
 #undef QCONFIG_INSTANCE
 
 namespace qConfig
 {
-#define QCONFIG_SETTING(name, type)                     \
-  struct qon_mxcat3(q, name, _t) {                      \
-    type v;                                             \
-    constexpr qon_mxcat3(q, name, _t)(type s) : v(s) {} \
-  };                                                    \
-  constexpr qon_mxcat3(q, name, _t) name(type v) { return (qon_mxcat3(q, name, _t)(v)); }
-
-#define QCONFIG_SETTING_TEMPLATE(name)                      \
-  template <typename T>                                     \
-  struct qon_mxcat3(q, name, _t) {                          \
-    T v;                                                    \
-    constexpr qon_mxcat3(q, name, _t)(const T& s) : v(s) {} \
-  };                                                        \
-  template <typename T>                                     \
-  constexpr qon_mxcat3(q, name, _t)<T> name(T v)            \
-  {                                                         \
-    return (qon_mxcat3(q, name, _t) < T > (v));             \
-  }
-
-QCONFIG_SETTING(message, const char*)
-QCONFIG_SETTING_TEMPLATE(min)
-QCONFIG_SETTING_TEMPLATE(max)
-QCONFIG_SETTING_TEMPLATE(set)
-QCONFIG_SETTING_TEMPLATE(def)
 
 static inline const char* getOptName(const char** argv, int32_t i)
 {
@@ -477,22 +454,22 @@ static inline void qConfigHelp(const char* subConfig = nullptr, int32_t followSu
     printf("Usage Info:");
   }
 #define QCONFIG_HELP
-#include "qconfig.h"
+#include "qconfig_internal.h"
 #undef QCONFIG_HELP
   if (followSub < 2) {
     printf("\n");
   }
 }
 
 // Create parser for configuration
-static inline int32_t qConfigParse(int argc, const char** argv, const char* /*filename*/)
+int32_t qConfigParse(int argc, const char** argv, const char* /*filename*/)
 {
   for (int32_t i = 1; i < argc; i++) {
     const char* thisoption = argv[i];
   repeat:
     bool found = false;
 #define QCONFIG_PARSE
-#include "qconfig.h"
+#include "qconfig_internal.h"
 #undef QCONFIG_PARSE
     if (found == false) {
       printf("Invalid argument: %s\n", argv[i]);
@@ -505,16 +482,13 @@ static inline int32_t qConfigParse(int argc, const char** argv, const char* /*fi
 
 std::vector<std::function<void()>> qprint_global;
 #define QCONFIG_PRINT
-#include "qconfig.h"
+#include "qconfig_internal.h"
 #undef QCONFIG_PRINT
-} // end namespace qConfig
-
-// Main parse function called from outside
-int32_t qConfigParse(int argc, const char** argv, const char* filename) { return (qConfig::qConfigParse(argc, argv, filename)); }
 
 void qConfigPrint()
 {
-  for (auto& f : qConfig::qprint_global) {
+  for (auto& f : qprint_global) {
     f();
   }
 }
+} // end namespace qConfig

GPU/GPUTracking/utils/qconfig.h

@@ -0,0 +1,40 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file qconfig_general.h
+/// \author David Rohr
+
+#ifndef QCONFIG_H_GENERAL
+#define QCONFIG_H_GENERAL
+#ifndef GPUCA_GPUCODE_DEVICE
+#include <cstdint>
+#include <string>
+#endif
+
+namespace qConfig
+{
+#ifndef GPUCA_GPUCODE_DEVICE
+int32_t qConfigParse(int argc, const char** argv, const char* filename = nullptr);
+void qConfigPrint(); // Print all settings
+template <class T>
+void qConfigPrint(const T& qconfig_tmp_object, const std::string& blockName = ""); // Print one sub config, specializations created in qconfig.cxx
+#endif
+enum qConfigRetVal { qcrOK = 0,
+                     qcrError = 1,
+                     qcrMinFailure = 2,
+                     qcrMaxFailure = 3,
+                     qcrHelp = 4,
+                     qcrCmd = 5,
+                     qcrArgMissing = 6,
+                     qcrArgIncomplete = 7,
+                     qcrArrayOverflow = 8 };
+} // namespace qConfig
+#endif // QCONFIG_H_GENERAL