Skip to content

Commit 3b67095

Browse files
davidrohrehellbar
authored andcommitted
GPU: Fix forwarding of exit code when using doublePipelined processing
1 parent 952a805 commit 3b67095

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

GPU/GPUTracking/Base/GPUReconstructionCPU.cxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,9 @@ int32_t GPUReconstructionCPU::RunChains()
216216

217217
timerTotal.Start();
218218
if (mProcessingSettings.doublePipeline) {
219-
if (EnqueuePipeline()) {
220-
return 1;
219+
int32_t retVal = EnqueuePipeline();
220+
if (retVal) {
221+
return retVal;
221222
}
222223
} else {
223224
if (mThreadId != GetThread()) {

GPU/GPUTracking/Definitions/GPUSettingsList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ AddOptionRTC(extraClusterErrorSplitPadSharedSingleY2, float, 0.03f, "", 0, "Addi
8989
AddOptionRTC(extraClusterErrorFactorSplitPadSharedSingleY2, float, 3.0f, "", 0, "Multiplicative extra cluster error for Y2 if splitpad, shared, or single set")
9090
AddOptionRTC(extraClusterErrorSplitTimeSharedSingleZ2, float, 0.03f, "", 0, "Additive extra cluster error for Z2 if splittime, shared, or single set")
9191
AddOptionRTC(extraClusterErrorFactorSplitTimeSharedSingleZ2, float, 3.0f, "", 0, "Multiplicative extra cluster error for Z2 if splittime, shared, or single set")
92-
AddOptionArray(errorsCECrossing, float, 5, (0.f, 0.f, 0.f, 0.f, 0.f), "", 0, "Extra errors to add to track when crossing CE, depending on addErrorsCECrossing") // BUG: CUDA cannot yet hand AddOptionArrayRTC
92+
AddOptionArray(errorsCECrossing, float, 5, (0.f, 0.f, 0.f, 0.f, 0.f), "", 0, "Extra errors to add to track when crossing CE, depending on addErrorsCECrossing") // BUG: CUDA cannot yet handle AddOptionArrayRTC
9393
AddOptionRTC(globalTrackingYRangeUpper, float, 0.85f, "", 0, "Inner portion of y-range in slice that is not used in searching for global track candidates")
9494
AddOptionRTC(globalTrackingYRangeLower, float, 0.85f, "", 0, "Inner portion of y-range in slice that is not used in searching for global track candidates")
9595
AddOptionRTC(trackFollowingYFactor, float, 4.f, "", 0, "Weight of y residual vs z residual in tracklet constructor")

GPU/Workflow/src/GPUWorkflowSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ void GPURecoWorkflowSpec::run(ProcessingContext& pc)
851851
}
852852
createEmptyOutput = !mConfParam->partialOutputForNonFatalErrors;
853853
} else {
854-
throw std::runtime_error("tracker returned error code " + std::to_string(retVal));
854+
throw std::runtime_error("GPU Reconstruction error: error code " + std::to_string(retVal));
855855
}
856856
}
857857

0 commit comments

Comments
 (0)