Skip to content

GPU: Rename GPU ConfigurableParam header, and move it to DataTypes together with ExternalUser header #14828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 1 commit into from
Nov 18, 2025
Merged

GPU: Rename GPU ConfigurableParam header, and move it to DataTypes together with ExternalUser header #14828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Detectors/TPC/workflow/src/CalibdEdxSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion GPU/GPUTracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...rface/GPUO2InterfaceConfigurableParam.cxx → ...king/DataTypes/GPUO2ConfigurableParam.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
11 changes: 4 additions & 7 deletions ...terface/GPUO2InterfaceConfigurableParam.h → ...acking/DataTypes/GPUO2ConfigurableParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"
Expand All @@ -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<GPUCA_M_CAT(GPUConfigurableParam, name)> { \
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() \
} \
Expand Down
0 ...GPUTracking/Interface/GPUO2ExternalUser.h → ...GPUTracking/DataTypes/GPUO2ExternalUser.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion doc/data/2021-01-o2_prs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,7 +1730,7 @@
},
{
"node": {
"path": "GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.cxx"
"path": "GPU/GPUTracking/Interface/GPUO2ConfigurableParam.cxx"
}
},
{
Expand Down