From 851688b6bff4b2fa3a9754506592132cc19a88ad Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Sat, 6 Oct 2018 14:29:06 +0200 Subject: [PATCH] Suppress asserts in the GPU code, unless GPU_DEBUG is defined (#186) --- RecoPixelVertexing/PixelTrackFitting/interface/RiemannFit.h | 4 +++- RecoPixelVertexing/PixelTriplets/plugins/GPUCACell.h | 5 +++-- RecoPixelVertexing/PixelTriplets/plugins/gpuPixelDoublets.h | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/RiemannFit.h b/RecoPixelVertexing/PixelTrackFitting/interface/RiemannFit.h index ac5e82b542e73..6de1c77bbac12 100644 --- a/RecoPixelVertexing/PixelTrackFitting/interface/RiemannFit.h +++ b/RecoPixelVertexing/PixelTrackFitting/interface/RiemannFit.h @@ -1,11 +1,13 @@ #ifndef RecoPixelVertexing_PixelTrackFitting_interface_RiemannFit_h #define RecoPixelVertexing_PixelTrackFitting_interface_RiemannFit_h +#include + #include #include #include -#include +#include "HeterogeneousCore/CUDAUtilities/interface/cuda_assert.h" #ifndef RFIT_DEBUG #define RFIT_DEBUG 0 diff --git a/RecoPixelVertexing/PixelTriplets/plugins/GPUCACell.h b/RecoPixelVertexing/PixelTriplets/plugins/GPUCACell.h index 772b802282d31..43fcd88fa30de 100644 --- a/RecoPixelVertexing/PixelTriplets/plugins/GPUCACell.h +++ b/RecoPixelVertexing/PixelTriplets/plugins/GPUCACell.h @@ -6,9 +6,10 @@ #include -#include "RecoLocalTracker/SiPixelRecHits/plugins/siPixelRecHitsHeterogeneousProduct.h" -#include "HeterogeneousCore/CUDAUtilities/interface/GPUVecArray.h" #include "HeterogeneousCore/CUDAUtilities/interface/GPUSimpleVector.h" +#include "HeterogeneousCore/CUDAUtilities/interface/GPUVecArray.h" +#include "HeterogeneousCore/CUDAUtilities/interface/cuda_assert.h" +#include "RecoLocalTracker/SiPixelRecHits/plugins/siPixelRecHitsHeterogeneousProduct.h" struct Quadruplet { using hindex_type = siPixelRecHitsHeterogeneousProduct::hindex_type; diff --git a/RecoPixelVertexing/PixelTriplets/plugins/gpuPixelDoublets.h b/RecoPixelVertexing/PixelTriplets/plugins/gpuPixelDoublets.h index 61d048637585c..d4b44f64573c6 100644 --- a/RecoPixelVertexing/PixelTriplets/plugins/gpuPixelDoublets.h +++ b/RecoPixelVertexing/PixelTriplets/plugins/gpuPixelDoublets.h @@ -2,17 +2,17 @@ #define RecoLocalTracker_SiPixelRecHits_plugins_gpuPixelDouplets_h #include -#include #include #include #include #include #include "DataFormats/Math/interface/approx_atan2.h" +#include "HeterogeneousCore/CUDAUtilities/interface/GPUVecArray.h" +#include "HeterogeneousCore/CUDAUtilities/interface/cuda_assert.h" #include "RecoLocalTracker/SiPixelRecHits/plugins/siPixelRecHitsHeterogeneousProduct.h" #include "GPUCACell.h" -#include "HeterogeneousCore/CUDAUtilities/interface/GPUVecArray.h" namespace gpuPixelDoublets {