Skip to content

Commit 52f2925

Browse files
davidrohrdavidrohr
committed
GPU DataTypes / QA: Clean up some data types / enums
1 parent 40fd024 commit 52f2925

File tree

99 files changed

+443
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+443
-388
lines changed

‎DataFormats/Detectors/TRD/include/DataFormatsTRD/RecoInputContainer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "Framework/InputRecord.h"
2828
#include "SimulationDataFormat/MCTruthContainer.h"
2929

30-
#include "GPUDataTypes.h"
30+
#include "GPUDataTypesIO.h"
3131

3232
#include <gsl/span>
3333
#include <memory>

‎Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackingInterface.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "DataFormatsITSMFT/TopologyDictionary.h"
2525
#include "DataFormatsCalibration/MeanVertexObject.h"
2626

27-
#include "GPUDataTypes.h"
27+
#include "GPUDataTypesIO.h"
2828
#include "GPUO2ExternalUser.h"
2929
#include "GPUChainITS.h"
3030

‎Detectors/ITSMFT/ITS/workflow/include/ITSWorkflow/RecoWorkflow.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "Framework/WorkflowSpec.h"
1818
#include "ITStracking/Configuration.h"
19-
#include "GPUDataTypes.h"
19+
#include "GPUDataTypesIO.h"
2020

2121
namespace o2
2222
{
@@ -28,7 +28,7 @@ namespace reco_workflow
2828

2929
framework::WorkflowSpec getWorkflow(bool useMC, bool useCMtracker, TrackingMode::Type trmode, const bool overrideBeamPosition = false,
3030
bool upstreamDigits = false, bool upstreamClusters = false, bool disableRootOutput = false, bool useGeom = false, int useTrig = 0,
31-
bool useGPUWF = false, o2::gpu::GPUDataTypes::DeviceType dType = o2::gpu::GPUDataTypes::DeviceType::CPU);
31+
bool useGPUWF = false, o2::gpu::gpudatatypes::DeviceType dType = o2::gpu::gpudatatypes::DeviceType::CPU);
3232
}
3333

3434
} // namespace its

‎Detectors/ITSMFT/ITS/workflow/include/ITSWorkflow/TrackerSpec.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "ITStracking/TrackingInterface.h"
2525

26-
#include "GPUDataTypes.h"
26+
#include "GPUDataTypesIO.h"
2727
#include "DetectorsBase/GRPGeomHelper.h"
2828

2929
#include "TStopwatch.h"
@@ -39,7 +39,7 @@ class TrackerDPL : public framework::Task
3939
int trgType,
4040
const TrackingMode::Type trMode = TrackingMode::Unset,
4141
const bool overrBeamEst = false,
42-
o2::gpu::GPUDataTypes::DeviceType dType = o2::gpu::GPUDataTypes::DeviceType::CPU);
42+
o2::gpu::gpudatatypes::DeviceType dType = o2::gpu::gpudatatypes::DeviceType::CPU);
4343
~TrackerDPL() override = default;
4444
void init(framework::InitContext& ic) final;
4545
void run(framework::ProcessingContext& pc) final;
@@ -57,7 +57,7 @@ class TrackerDPL : public framework::Task
5757
TStopwatch mTimer;
5858
};
5959

60-
framework::DataProcessorSpec getTrackerSpec(bool useMC, bool useGeom, int useTrig, TrackingMode::Type trMode, const bool overrBeamEst = false, o2::gpu::GPUDataTypes::DeviceType dType = o2::gpu::GPUDataTypes::DeviceType::CPU);
60+
framework::DataProcessorSpec getTrackerSpec(bool useMC, bool useGeom, int useTrig, TrackingMode::Type trMode, const bool overrBeamEst = false, o2::gpu::gpudatatypes::DeviceType dType = o2::gpu::gpudatatypes::DeviceType::CPU);
6161

6262
} // namespace o2::its
6363

‎Detectors/ITSMFT/ITS/workflow/src/RecoWorkflow.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ framework::WorkflowSpec getWorkflow(bool useMC,
3838
bool useGeom,
3939
int useTrig,
4040
bool useGPUWF,
41-
o2::gpu::GPUDataTypes::DeviceType dtype)
41+
o2::gpu::gpudatatypes::DeviceType dtype)
4242
{
4343
framework::WorkflowSpec specs;
4444
if (!(upstreamDigits || upstreamClusters)) {

‎Detectors/ITSMFT/ITS/workflow/src/TrackerSpec.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ TrackerDPL::TrackerDPL(std::shared_ptr<o2::base::GRPGeomRequest> gr,
2828
int trgType,
2929
const TrackingMode::Type trMode,
3030
const bool overrBeamEst,
31-
o2::gpu::GPUDataTypes::DeviceType dType) : mGGCCDBRequest(gr),
31+
o2::gpu::gpudatatypes::DeviceType dType) : mGGCCDBRequest(gr),
3232
mRecChain{o2::gpu::GPUReconstruction::CreateInstance(dType, true)},
3333
mITSTrackingInterface{isMC, trgType, overrBeamEst}
3434
{
@@ -78,7 +78,7 @@ void TrackerDPL::end()
7878
LOGF(info, "ITS CA-Tracker total timing: Cpu: %.3e Real: %.3e s in %d slots", mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
7979
}
8080

81-
DataProcessorSpec getTrackerSpec(bool useMC, bool useGeom, int trgType, TrackingMode::Type trMode, const bool overrBeamEst, o2::gpu::GPUDataTypes::DeviceType dType)
81+
DataProcessorSpec getTrackerSpec(bool useMC, bool useGeom, int trgType, TrackingMode::Type trMode, const bool overrBeamEst, o2::gpu::gpudatatypes::DeviceType dType)
8282
{
8383
std::vector<InputSpec> inputs;
8484

‎Detectors/ITSMFT/ITS/workflow/src/its-reco-workflow.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
6969
auto trmode = configcontext.options().get<std::string>("tracking-mode");
7070
auto selTrig = configcontext.options().get<std::string>("select-with-triggers");
7171
auto useGpuWF = configcontext.options().get<bool>("use-gpu-workflow");
72-
auto gpuDevice = static_cast<o2::gpu::GPUDataTypes::DeviceType>(configcontext.options().get<int>("gpu-device"));
72+
auto gpuDevice = static_cast<o2::gpu::gpudatatypes::DeviceType>(configcontext.options().get<int>("gpu-device"));
7373
auto extDigits = configcontext.options().get<bool>("digits-from-upstream");
7474
auto extClusters = configcontext.options().get<bool>("clusters-from-upstream");
7575
auto disableRootOutput = configcontext.options().get<bool>("disable-root-output");

‎Detectors/TPC/reconstruction/test/testGPUCATracking.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(CATracking_test1)
5555
bool continuous = false; // time frame data v.s. triggered events
5656

5757
GPUO2InterfaceConfiguration config;
58-
config.configDeviceBackend.deviceType = GPUDataTypes::DeviceType::CPU;
58+
config.configDeviceBackend.deviceType = gpudatatypes::DeviceType::CPU;
5959
config.configDeviceBackend.forceDeviceType = true;
6060

6161
config.configProcessing.ompThreads = 4; // 4 threads if we run on the CPU, 1 = default, 0 = auto-detect
@@ -69,10 +69,10 @@ BOOST_AUTO_TEST_CASE(CATracking_test1)
6969
config.configReconstruction.tpc.searchWindowDZDR = 2.5f; // Should always be 2.5 for looper-finding and/or continuous tracking
7070
config.configReconstruction.tpc.trackReferenceX = refX;
7171

72-
config.configWorkflow.steps.set(GPUDataTypes::RecoStep::TPCConversion, GPUDataTypes::RecoStep::TPCSectorTracking,
73-
GPUDataTypes::RecoStep::TPCMerging, GPUDataTypes::RecoStep::TPCCompression, GPUDataTypes::RecoStep::TPCdEdx);
74-
config.configWorkflow.inputs.set(GPUDataTypes::InOutType::TPCClusters);
75-
config.configWorkflow.outputs.set(GPUDataTypes::InOutType::TPCMergedTracks);
72+
config.configWorkflow.steps.set(gpudatatypes::RecoStep::TPCConversion, gpudatatypes::RecoStep::TPCSectorTracking,
73+
gpudatatypes::RecoStep::TPCMerging, gpudatatypes::RecoStep::TPCCompression, gpudatatypes::RecoStep::TPCdEdx);
74+
config.configWorkflow.inputs.set(gpudatatypes::InOutType::TPCClusters);
75+
config.configWorkflow.outputs.set(gpudatatypes::InOutType::TPCMergedTracks);
7676

7777
std::unique_ptr<TPCFastTransform> fastTransform(TPCFastTransformHelperO2::instance()->create(0));
7878
std::unique_ptr<CorrectionMapsHelper> fastTransformHelper(new CorrectionMapsHelper());

‎Detectors/TPC/workflow/src/ZSSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "DataFormatsTPC/ZeroSuppression.h"
2323
#include "DataFormatsTPC/Helpers.h"
2424
#include "DataFormatsTPC/Digit.h"
25-
#include "GPUDataTypes.h"
25+
#include "GPUDataTypesIO.h"
2626
#include "GPUHostDataTypes.h"
2727
#include "GPUO2InterfaceConfiguration.h"
2828
#include "TPCBase/Sector.h"

‎Detectors/TRD/workflow/src/TRDGlobalTrackingSpec.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#include "GPUO2InterfaceConfiguration.h"
4747
#include "GPUO2InterfaceUtils.h"
4848
#include "GPUSettings.h"
49-
#include "GPUDataTypes.h"
49+
#include "GPUDataTypesIO.h"
5050
#include "GPUTRDDef.h"
5151
#include "GPUTRDTrack.h"
5252
#include "GPUTRDTrackletWord.h"
@@ -103,7 +103,7 @@ void TRDGlobalTracking::updateTimeDependentParams(ProcessingContext& pc)
103103
mFlatGeo = std::make_unique<GeometryFlat>(*geo);
104104

105105
GPURecoStepConfiguration cfgRecoStep;
106-
cfgRecoStep.steps = GPUDataTypes::RecoStep::NoRecoStep;
106+
cfgRecoStep.steps = gpudatatypes::RecoStep::NoRecoStep;
107107
cfgRecoStep.inputs.clear();
108108
cfgRecoStep.outputs.clear();
109109
mRec = GPUReconstruction::CreateInstance("CPU", true);

0 commit comments

Comments
 (0)