Skip to content

Commit f0645e2

Browse files
committed
GPU: Rename GPU ConfigurableParam header, and move it to DataTypes together with ExternalUser header
1 parent fb593d6 commit f0645e2

File tree

7 files changed

+10
-13
lines changed

7 files changed

+10
-13
lines changed

Detectors/TPC/workflow/src/CalibdEdxSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "Framework/DataProcessorSpec.h"
2727
#include "Framework/ConfigParamRegistry.h"
2828
#include "Framework/CCDBParamSpec.h"
29-
#include "GPUO2InterfaceConfigurableParam.h"
29+
#include "GPUO2ConfigurableParam.h"
3030
#include "TPCCalibration/CalibdEdx.h"
3131
#include "TPCWorkflow/ProcessingHelpers.h"
3232
#include "TPCBase/CDBTypes.h"

Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "Framework/DataProcessorSpec.h"
3030
#include "Framework/ConfigParamRegistry.h"
3131
#include "Framework/CCDBParamSpec.h"
32-
#include "GPUO2InterfaceConfigurableParam.h"
32+
#include "GPUO2ConfigurableParam.h"
3333
#include "TPCCalibration/CalibratordEdx.h"
3434
#include "TPCWorkflow/ProcessingHelpers.h"
3535
#include "DetectorsBase/GRPGeomHelper.h"

GPU/GPUTracking/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ set(HDRS_INSTALL ${HDRS_INSTALL}
228228
if(ALIGPU_BUILD_TYPE STREQUAL "O2")
229229
set(SRCS_DATATYPES
230230
${SRCS_DATATYPES}
231-
Interface/GPUO2InterfaceConfigurableParam.cxx)
231+
DataTypes/GPUO2ConfigurableParam.cxx)
232232
endif()
233233

234234
set(TEMPLATE_HEADER_LIST Base/GPUReconstructionKernelList.template.h

GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.cxx renamed to GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file GPUO2InterfaceConfigurableParam.cxx
12+
/// \file GPUO2ConfigurableParam.cxx
1313
/// \author David Rohr
1414

15-
#include "GPUO2InterfaceConfigurableParam.h"
16-
#include "GPUO2InterfaceConfiguration.h"
15+
#include "GPUO2ConfigurableParam.h"
16+
#include "Interface/GPUO2InterfaceConfiguration.h"
1717
#include "GPUDataTypes.h"
1818
#include "GPUConfigDump.h"
1919

GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.h renamed to GPU/GPUTracking/DataTypes/GPUO2ConfigurableParam.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file GPUO2InterfaceConfigurableParam.h
12+
/// \file GPUO2ConfigurableParam.h
1313
/// \author David Rohr
1414

1515
// This file auto-generates a ConfigurableParam object from the GPU parameter macros.
@@ -19,13 +19,10 @@
1919
// --configKeyValues "GPU_proc.[x]=[y]" : for processing options steering GPU reconstruction like GPU device ID, debug output level, number of CPU threads.
2020
// Check GPUSettingsList.h for all options
2121

22-
#ifndef GPUO2INTERFACECONFIGURABLEPARAM_H
23-
#define GPUO2INTERFACECONFIGURABLEPARAM_H
22+
#ifndef GPUO2CONFIGURABLEPARAM_H
23+
#define GPUO2CONFIGURABLEPARAM_H
2424

25-
#if !defined(GPUCA_STANDALONE) && !defined(GPUCA_O2_LIB)
2625
#include "GPUO2ExternalUser.h"
27-
#endif
28-
2926
#include "CommonUtils/ConfigurableParam.h"
3027
#include "CommonUtils/ConfigurableParamHelper.h"
3128
#include "GPUSettings.h"
File renamed without changes.

doc/data/2021-01-o2_prs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,7 @@
17301730
},
17311731
{
17321732
"node": {
1733-
"path": "GPU/GPUTracking/Interface/GPUO2InterfaceConfigurableParam.cxx"
1733+
"path": "GPU/GPUTracking/Interface/GPUO2ConfigurableParam.cxx"
17341734
}
17351735
},
17361736
{

0 commit comments

Comments
 (0)