From 14ccdc6f7559397d9a238371cc17ff3df621b1c9 Mon Sep 17 00:00:00 2001
From: Vincenzo Innocente <vincenzo.innocente@cern.ch>
Date: Mon, 2 Dec 2019 14:37:30 +0100
Subject: [PATCH] Move LogWarning into the EDProducer (#422)

In CMSSW 11.0.0 the MessageLogger is no longer usable in CUDA code due
to the use of c++17 featutres.
---
 RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.cu    | 6 ------
 .../SiPixelRecHits/plugins/SiPixelRecHitCUDA.cc            | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.cu b/RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.cu
index de862871548ee..1342ab916e472 100644
--- a/RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.cu
+++ b/RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.cu
@@ -6,7 +6,6 @@
 #include <cuda_runtime.h>
 
 // CMSSW headers
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
 #include "RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.h"
@@ -63,11 +62,6 @@ namespace pixelgpudetails {
       cudaCheck(cudaGetLastError());
     }
 
-    if (nHits >= TrackingRecHit2DSOAView::maxHits()) {
-      edm::LogWarning("PixelRecHitGPUKernel")
-          << "Hits Overflow " << nHits << " > " << TrackingRecHit2DSOAView::maxHits();
-    }
-
     if (nHits) {
       auto hws = cudautils::make_device_unique<uint8_t[]>(TrackingRecHit2DSOAView::Hist::wsSize(), stream);
       cudautils::fillManyFromVector(
diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitCUDA.cc b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitCUDA.cc
index 2ec203819731b..d3da3453c6f37 100644
--- a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitCUDA.cc
+++ b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitCUDA.cc
@@ -96,6 +96,13 @@ void SiPixelRecHitCUDA::produce(edm::StreamID streamID, edm::Event& iEvent, cons
   iEvent.getByToken(tBeamSpot, hbs);
   auto const& bs = ctx.get(*hbs);
 
+
+  auto nHits = clusters.nClusters();
+  if (nHits >= TrackingRecHit2DSOAView::maxHits()) {
+      edm::LogWarning("PixelRecHitGPUKernel")
+          << "Clusters/Hits Overflow " << nHits << " >= " << TrackingRecHit2DSOAView::maxHits();
+    }
+
   ctx.emplace(iEvent,
               tokenHit_,
               gpuAlgo_.makeHitsAsync(digis, clusters, bs, fcpe->getGPUProductAsync(ctx.stream()), ctx.stream()));