From c0c0e4cae9fe252be59a99f9415e581aae1a9b94 Mon Sep 17 00:00:00 2001 From: David Rohr Date: Tue, 18 Nov 2025 00:55:16 +0100 Subject: [PATCH] GPU: Rename GPU ConfigurableParam header, and move it to DataTypes together with ExternalUser header --- Detectors/TPC/workflow/src/CalibdEdxSpec.cxx | 2 +- Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx | 2 +- GPU/GPUTracking/CMakeLists.txt | 3 ++- .../GPUO2ConfigurableParam.cxx} | 6 +++--- .../GPUO2ConfigurableParam.h} | 11 ++++------- .../{Interface => DataTypes}/GPUO2ExternalUser.h | 0 GPU/GPUTracking/Interface/CMakeLists.txt | 2 +- doc/data/2021-01-o2_prs.json | 2 +- 8 files changed, 13 insertions(+), 15 deletions(-) rename GPU/GPUTracking/{Interface/GPUO2InterfaceConfigurableParam.cxx => DataTypes/GPUO2ConfigurableParam.cxx} (97%) rename GPU/GPUTracking/{Interface/GPUO2InterfaceConfigurableParam.h => DataTypes/GPUO2ConfigurableParam.h} (90%) rename GPU/GPUTracking/{Interface => DataTypes}/GPUO2ExternalUser.h (100%) diff --git a/Detectors/TPC/workflow/src/CalibdEdxSpec.cxx b/Detectors/TPC/workflow/src/CalibdEdxSpec.cxx index 5cf412f227d78..e3943f92235ab 100644 --- a/Detectors/TPC/workflow/src/CalibdEdxSpec.cxx +++ b/Detectors/TPC/workflow/src/CalibdEdxSpec.cxx @@ -26,7 +26,7 @@ #include "Framework/DataProcessorSpec.h" #include "Framework/ConfigParamRegistry.h" #include "Framework/CCDBParamSpec.h" -#include "GPUO2InterfaceConfigurableParam.h" +#include "GPUO2ConfigurableParam.h" #include "TPCCalibration/CalibdEdx.h" #include "TPCWorkflow/ProcessingHelpers.h" #include "TPCBase/CDBTypes.h" diff --git a/Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx b/Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx index 4c2a26da38908..82e6d5075d7f0 100644 --- a/Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx +++ b/Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx @@ -29,7 +29,7 @@ #include "Framework/DataProcessorSpec.h" #include "Framework/ConfigParamRegistry.h" #include "Framework/CCDBParamSpec.h" -#include "GPUO2InterfaceConfigurableParam.h" +#include "GPUO2ConfigurableParam.h" #include "TPCCalibration/CalibratordEdx.h" #include "TPCWorkflow/ProcessingHelpers.h" #include "DetectorsBase/GRPGeomHelper.h" diff --git a/GPU/GPUTracking/CMakeLists.txt b/GPU/GPUTracking/CMakeLists.txt index 29c95eba4280a..2a0b9b9edfa09 100644 --- a/GPU/GPUTracking/CMakeLists.txt +++ b/GPU/GPUTracking/CMakeLists.txt @@ -130,6 +130,7 @@ set(HDRS_INSTALL DataTypes/GPUTRDInterfaceO2Track.h DataTypes/GPUTriggerOutputs.h DataTypes/GPUKernelClassesFwd.h + DataTypes/GPUO2ExternalUser.h Debug/GPUROOTDump.h Definitions/GPUDefConstantsAndSettings.h Definitions/GPUDefParametersWrapper.h @@ -228,7 +229,7 @@ set(HDRS_INSTALL ${HDRS_INSTALL} if(ALIGPU_BUILD_TYPE STREQUAL "O2") set(SRCS_DATATYPES ${SRCS_DATATYPES} - Interface/GPUO2InterfaceConfigurableParam.cxx) + DataTypes/GPUO2ConfigurableParam.cxx) endif() set(TEMPLATE_HEADER_LIST Base/GPUReconstructionKernelList.template.h diff --git a/GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.cxx b/GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.cxx similarity index 97% rename from GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.cxx rename to GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.cxx index 86ae8e3457019..f5b3ea8b285f5 100644 --- a/GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.cxx +++ b/GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.cxx @@ -9,11 +9,11 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file GPUO2InterfaceConfigurableParam.cxx +/// \file GPUO2ConfigurableParam.cxx /// \author David Rohr -#include "GPUO2InterfaceConfigurableParam.h" -#include "GPUO2InterfaceConfiguration.h" +#include "GPUO2ConfigurableParam.h" +#include "Interface/GPUO2InterfaceConfiguration.h" #include "GPUDataTypes.h" #include "GPUConfigDump.h" diff --git a/GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.h b/GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.h similarity index 90% rename from GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.h rename to GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.h index 676d2c22f57c7..8bc0d98910f54 100644 --- a/GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.h +++ b/GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.h @@ -9,7 +9,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file GPUO2InterfaceConfigurableParam.h +/// \file GPUO2ConfigurableParam.h /// \author David Rohr // This file auto-generates a ConfigurableParam object from the GPU parameter macros. @@ -19,13 +19,10 @@ // --configKeyValues "GPU_proc.[x]=[y]" : for processing options steering GPU reconstruction like GPU device ID, debug output level, number of CPU threads. // Check GPUSettingsList.h for all options -#ifndef GPUO2INTERFACECONFIGURABLEPARAM_H -#define GPUO2INTERFACECONFIGURABLEPARAM_H +#ifndef GPUO2CONFIGURABLEPARAM_H +#define GPUO2CONFIGURABLEPARAM_H -#if !defined(GPUCA_STANDALONE) && !defined(GPUCA_O2_LIB) #include "GPUO2ExternalUser.h" -#endif - #include "CommonUtils/ConfigurableParam.h" #include "CommonUtils/ConfigurableParamHelper.h" #include "GPUSettings.h" @@ -46,7 +43,7 @@ #define AddSubConfig(name, instance) #define BeginSubConfig(name, instance, parent, preoptname, preoptnameshort, descr, o2prefix) \ struct GPUCA_M_CAT(GPUConfigurableParam, name) : public o2::conf::ConfigurableParamHelper { \ - O2ParamDef(GPUCA_M_CAT(GPUConfigurableParam, name), GPUCA_M_STR(GPUCA_M_CAT(GPU_, o2prefix))) public: + O2ParamDef(GPUCA_M_CAT(GPUConfigurableParam, name), GPUCA_M_STR(GPUCA_M_CAT(GPU_, o2prefix))) public: #define BeginHiddenConfig(name, instance) struct GPUCA_M_CAT(GPUConfigurableParam, name) { #define EndConfig() \ } \ diff --git a/GPU/GPUTracking/Interface/GPUO2ExternalUser.h b/GPU/GPUTracking/DataTypes/GPUO2ExternalUser.h similarity index 100% rename from GPU/GPUTracking/Interface/GPUO2ExternalUser.h rename to GPU/GPUTracking/DataTypes/GPUO2ExternalUser.h diff --git a/GPU/GPUTracking/Interface/CMakeLists.txt b/GPU/GPUTracking/Interface/CMakeLists.txt index 169b043b992bc..e532b24f97908 100644 --- a/GPU/GPUTracking/Interface/CMakeLists.txt +++ b/GPU/GPUTracking/Interface/CMakeLists.txt @@ -23,7 +23,7 @@ if(OPENGL_FOUND endif() string(REPLACE ".cxx" ".h" HDRS_TMP "${SRCS}") -set(HDRS ${HDRS_TMP} GPUO2ExternalUser.h) +set(HDRS ${HDRS_TMP}) o2_add_library(${MODULE} SOURCES ${SRCS} diff --git a/doc/data/2021-01-o2_prs.json b/doc/data/2021-01-o2_prs.json index e287eaeeda857..06cd97dd6d7b7 100644 --- a/doc/data/2021-01-o2_prs.json +++ b/doc/data/2021-01-o2_prs.json @@ -1730,7 +1730,7 @@ }, { "node": { - "path": "GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.cxx" + "path": "GPU/GPUTracking/Interface/GPUO2ConfigurableParam.cxx" } }, {