Skip to content

Commit 0b4799a

Browse files
davidrohrdavidrohr
committed
GPU Display: Rename GPUDisplayBackend to GPUDisplayFrontend
1 parent b1827f0 commit 0b4799a

26 files changed

Lines changed: 164 additions & 164 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(CATracking_test1)
5959
config.configProcessing.ompThreads = 4; //4 threads if we run on the CPU, 1 = default, 0 = auto-detect
6060
config.configProcessing.runQA = false; //Run QA after tracking
6161
config.configProcessing.eventDisplay = nullptr; //Ptr to event display backend, for running standalone OpenGL event display
62-
//config.configProcessing.eventDisplay = new GPUDisplayBackendGlfw;
62+
//config.configProcessing.eventDisplay = new GPUDisplayFrontendGlfw;
6363

6464
config.configGRP.solenoidBz = solenoidBz;
6565
config.configGRP.continuousMaxTimeBin = continuous ? GPUSettings::TPC_MAX_TF_TIME_BIN : 0; //Number of timebins in timeframe if continuous, 0 otherwise

‎GPU/GPUTracking/Base/GPUParam.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ std::string GPUParamRTC::generateRTCCode(const GPUParam& param, bool useConstexp
249249
return "#ifndef GPUCA_GPUCODE_DEVICE\n"
250250
"#include <string>\n"
251251
"#endif\n"
252-
"namespace o2::gpu { class GPUDisplayBackend; }\n" +
252+
"namespace o2::gpu { class GPUDisplayFrontend; }\n" +
253253
qConfigPrintRtc(std::make_tuple(&param.rec.tpc, &param.rec.trd, &param.rec, &param.par), useConstexpr);
254254
}
255255

‎GPU/GPUTracking/Benchmark/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ set(SRCS
1818

1919
if(GPUCA_EVENT_DISPLAY)
2020
set(SRCS ${SRCS}
21-
../display/GPUDisplayBackendX11.cxx
22-
../display/GPUDisplayBackendGlut.cxx)
21+
../display/GPUDisplayFrontendX11.cxx
22+
../display/GPUDisplayFrontendGlut.cxx)
2323
endif()
2424

2525
if(ALIGPU_BUILD_TYPE STREQUAL "O2")

‎GPU/GPUTracking/Benchmark/standalone.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "GPUChainTracking.h"
2020
#include "GPUTPCDef.h"
2121
#include "GPUQA.h"
22-
#include "GPUDisplayBackend.h"
22+
#include "GPUDisplayFrontend.h"
2323
#include "genEvents.h"
2424

2525
#include <iostream>
@@ -61,12 +61,12 @@
6161

6262
#ifdef GPUCA_BUILD_EVENT_DISPLAY
6363
#ifdef _WIN32
64-
#include "GPUDisplayBackendWindows.h"
64+
#include "GPUDisplayFrontendWindows.h"
6565
#else
66-
#include "GPUDisplayBackendX11.h"
67-
#include "GPUDisplayBackendGlfw.h"
66+
#include "GPUDisplayFrontendX11.h"
67+
#include "GPUDisplayFrontendGlfw.h"
6868
#endif
69-
#include "GPUDisplayBackendGlut.h"
69+
#include "GPUDisplayFrontendGlut.h"
7070
#endif
7171

7272
using namespace GPUCA_NAMESPACE::gpu;
@@ -88,7 +88,7 @@ void unique_ptr_aligned_delete(char* v)
8888
operator delete(v GPUCA_OPERATOR_NEW_ALIGNMENT);
8989
}
9090
std::unique_ptr<char, void (*)(char*)> outputmemory(nullptr, unique_ptr_aligned_delete), outputmemoryPipeline(nullptr, unique_ptr_aligned_delete), inputmemory(nullptr, unique_ptr_aligned_delete);
91-
std::unique_ptr<GPUDisplayBackend> eventDisplay;
91+
std::unique_ptr<GPUDisplayFrontend> eventDisplay;
9292
std::unique_ptr<GPUReconstructionTimeframe> tf;
9393
int nEventsInDirectory = 0;
9494
std::atomic<unsigned int> nIteration, nIterationEnd;
@@ -346,22 +346,22 @@ int SetupReconstruction()
346346
#ifdef _WIN32
347347
if (configStandalone.eventDisplay == 1) {
348348
printf("Enabling event display (windows backend)\n");
349-
eventDisplay.reset(new GPUDisplayBackendWindows);
349+
eventDisplay.reset(new GPUDisplayFrontendWindows);
350350
}
351351

352352
#else
353353
if (configStandalone.eventDisplay == 1) {
354-
eventDisplay.reset(new GPUDisplayBackendX11);
354+
eventDisplay.reset(new GPUDisplayFrontendX11);
355355
printf("Enabling event display (X11 backend)\n");
356356
}
357357
if (configStandalone.eventDisplay == 3) {
358-
eventDisplay.reset(new GPUDisplayBackendGlfw);
358+
eventDisplay.reset(new GPUDisplayFrontendGlfw);
359359
printf("Enabling event display (GLFW backend)\n");
360360
}
361361

362362
#endif
363363
else if (configStandalone.eventDisplay == 2) {
364-
eventDisplay.reset(new GPUDisplayBackendGlut);
364+
eventDisplay.reset(new GPUDisplayFrontendGlut);
365365
printf("Enabling event display (GLUT backend)\n");
366366
}
367367

‎GPU/GPUTracking/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ set(HDRS_INSTALL
161161

162162
# Sources for O2 and for Standalone if requested in config file
163163
if(ALIGPU_BUILD_TYPE STREQUAL "O2" OR ALIGPU_BUILD_TYPE STREQUAL "Standalone")
164-
set(SRCS_NO_CINT ${SRCS_NO_CINT} display/GPUDisplayBackend.cxx)
164+
set(SRCS_NO_CINT ${SRCS_NO_CINT} display/GPUDisplayFrontend.cxx)
165165
endif()
166166
if(ALIGPU_BUILD_TYPE STREQUAL "O2" OR CONFIG_O2_EXTENSIONS)
167167
set(SRCS_NO_CINT
@@ -236,7 +236,7 @@ endif()
236236
if(GPUCA_EVENT_DISPLAY)
237237
set(SRCS_NO_CINT ${SRCS_NO_CINT} utils/qsem.cxx
238238
display/GPUDisplay.cxx
239-
display/GPUDisplayBackendGlfw.cxx)
239+
display/GPUDisplayFrontendGlfw.cxx)
240240
set(SRCS_NO_H ${SRCS_NO_H} display/GPUDisplayQuaternion.cxx
241241
display/GPUDisplayInterpolation.cxx
242242
display/GPUDisplayKeys.cxx

‎GPU/GPUTracking/DataTypes/GPUSettings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace GPUCA_NAMESPACE
2626
{
2727
namespace gpu
2828
{
29-
class GPUDisplayBackend;
29+
class GPUDisplayFrontend;
3030
class GPUReconstruction;
3131

3232
class GPUSettings

‎GPU/GPUTracking/Definitions/GPUSettingsList.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ AddOption(ignoreNonFatalGPUErrors, bool, false, "", 0, "Continue running after h
172172
AddOption(tpcIncreasedMinClustersPerRow, unsigned int, 0, "", 0, "Impose a minimum buffer size for the clustersPerRow during TPC clusterization")
173173
AddOption(noGPUMemoryRegistration, bool, false, "", 0, "Do not register input / output memory for GPU dma transfer")
174174
AddOption(automaticQPtThresholds, bool, true, "", 0, "Update the QPt thresholde at initialization accoding to the B field (i.e. lower to 40% for B=0.2T)")
175-
AddVariable(eventDisplay, GPUCA_NAMESPACE::gpu::GPUDisplayBackend*, nullptr)
175+
AddVariable(eventDisplay, GPUCA_NAMESPACE::gpu::GPUDisplayFrontend*, nullptr)
176176
AddSubConfig(GPUSettingsProcessingRTC, rtc)
177177
AddHelp("help", 'h')
178178
EndConfig()

‎GPU/GPUTracking/Interface/GPUO2InterfaceDisplay.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "GPUQA.h"
1818
#include "GPUO2InterfaceConfiguration.h"
1919
#include "GPUO2InterfaceDisplay.h"
20-
#include "GPUDisplayBackend.h"
21-
#include "GPUDisplayBackendGlfw.h"
20+
#include "GPUDisplayFrontend.h"
21+
#include "GPUDisplayFrontendGlfw.h"
2222
#include <unistd.h>
2323

2424
using namespace o2::gpu;
@@ -27,7 +27,7 @@ using namespace o2::tpc;
2727
GPUO2InterfaceDisplay::GPUO2InterfaceDisplay(const GPUO2InterfaceConfiguration* config)
2828
{
2929
mConfig.reset(new GPUO2InterfaceConfiguration(*config));
30-
mBackend.reset(new GPUDisplayBackendGlfw);
30+
mBackend.reset(new GPUDisplayFrontendGlfw);
3131
mConfig->configProcessing.eventDisplay = mBackend.get();
3232
mConfig->configDisplay.showTPCTracksFromO2Format = true;
3333
mParam.reset(new GPUParam);

‎GPU/GPUTracking/Interface/GPUO2InterfaceDisplay.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class GPUQA;
3636
struct GPUParam;
3737
struct GPUTrackingInOutPointers;
3838
struct GPUO2InterfaceConfiguration;
39-
class GPUDisplayBackend;
39+
class GPUDisplayFrontend;
4040
class GPUO2InterfaceDisplay
4141
{
4242
public:
@@ -51,7 +51,7 @@ class GPUO2InterfaceDisplay
5151
std::unique_ptr<GPUDisplay> mDisplay;
5252
std::unique_ptr<GPUQA> mQA;
5353
std::unique_ptr<GPUParam> mParam;
54-
std::unique_ptr<GPUDisplayBackend> mBackend;
54+
std::unique_ptr<GPUDisplayFrontend> mBackend;
5555
std::unique_ptr<GPUO2InterfaceConfiguration> mConfig;
5656
};
5757
} // namespace o2::gpu

‎GPU/GPUTracking/display/GPUDisplay.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static const GPUSettingsDisplay& GPUDisplay_GetConfig(GPUChainTracking* chain)
105105
}
106106
}
107107

108-
GPUDisplay::GPUDisplay(GPUDisplayBackend* backend, GPUChainTracking* chain, GPUQA* qa, const GPUParam* param, const GPUCalibObjectsConst* calib, const GPUSettingsDisplay* config) : mBackend(backend), mChain(chain), mConfig(config ? *config : GPUDisplay_GetConfig(chain)), mQA(qa)
108+
GPUDisplay::GPUDisplay(GPUDisplayFrontend* backend, GPUChainTracking* chain, GPUQA* qa, const GPUParam* param, const GPUCalibObjectsConst* calib, const GPUSettingsDisplay* config) : mBackend(backend), mChain(chain), mConfig(config ? *config : GPUDisplay_GetConfig(chain)), mQA(qa)
109109
{
110110
backend->mDisplay = this;
111111
mCfgR.openGLCore = GPUCA_DISPLAY_OPENGL_CORE_FLAGS;
@@ -702,8 +702,8 @@ int GPUDisplay::InitGL_internal()
702702
int glVersion[2] = {0, 0};
703703
glGetIntegerv(GL_MAJOR_VERSION, &glVersion[0]);
704704
glGetIntegerv(GL_MINOR_VERSION, &glVersion[1]);
705-
if (glVersion[0] < GPUDisplayBackend::GL_MIN_VERSION_MAJOR || (glVersion[0] == GPUDisplayBackend::GL_MIN_VERSION_MAJOR && glVersion[1] < GPUDisplayBackend::GL_MIN_VERSION_MINOR)) {
706-
GPUError("Unsupported OpenGL runtime %d.%d < %d.%d", glVersion[0], glVersion[1], GPUDisplayBackend::GL_MIN_VERSION_MAJOR, GPUDisplayBackend::GL_MIN_VERSION_MINOR);
705+
if (glVersion[0] < GPUDisplayFrontend::GL_MIN_VERSION_MAJOR || (glVersion[0] == GPUDisplayFrontend::GL_MIN_VERSION_MAJOR && glVersion[1] < GPUDisplayFrontend::GL_MIN_VERSION_MINOR)) {
706+
GPUError("Unsupported OpenGL runtime %d.%d < %d.%d", glVersion[0], glVersion[1], GPUDisplayFrontend::GL_MIN_VERSION_MAJOR, GPUDisplayFrontend::GL_MIN_VERSION_MINOR);
707707
return (1);
708708
}
709709

@@ -716,7 +716,7 @@ int GPUDisplay::InitGL_internal()
716716
#endif
717717
setDepthBuffer();
718718
setQuality();
719-
ReSizeGLScene(GPUDisplayBackend::INIT_WIDTH, GPUDisplayBackend::INIT_HEIGHT, true);
719+
ReSizeGLScene(GPUDisplayFrontend::INIT_WIDTH, GPUDisplayFrontend::INIT_HEIGHT, true);
720720
mThreadBuffers.resize(getNumThreads());
721721
mThreadTracks.resize(getNumThreads());
722722
CHKERR(mVertexShader = glCreateShader(GL_VERTEX_SHADER));

0 commit comments

Comments
 (0)