From 6dd82be0cbe2bae2be520f7bd8e7145caa1c74fb Mon Sep 17 00:00:00 2001
From: Vincenzo Innocente <vincenzo.innocente@cern.ch>
Date: Mon, 18 May 2020 15:50:30 +0200
Subject: [PATCH] Remove dependency on cub (cms-patatrack#449)

Annotate all CMS-specific changes to CachingDeviceAllocator.

Co-authored-by: Andrea Bocci <andrea.bocci@cern.ch>
---
 RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml      | 3 +--
 .../SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.cu | 3 ---
 RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml         | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
index 1231eb7f0f377..d574c1e6f2b92 100644
--- a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
@@ -1,9 +1,8 @@
-<use name="cub"/>
+<use name="boost_serialization"/>
 <use name="cuda"/>
 <use name="DataFormats/Common"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/SiPixelCluster"/>
-<use name="boost_serialization"/>
 <use name="CalibTracker/SiPixelESProducers"/>
 <use name="CUDADataFormats/SiPixelCluster"/>
 <use name="CUDADataFormats/SiPixelDigi"/>
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.cu b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.cu
index acf6034d6c33c..cf2b10b198692 100644
--- a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.cu
+++ b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.cu
@@ -25,9 +25,6 @@
 #include <thrust/sort.h>
 #include <thrust/unique.h>
 
-// cub includes
-#include <cub/cub.cuh>
-
 // CMSSW includes
 #include "CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
diff --git a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml
index a1cb95039c078..1891970a9d98b 100644
--- a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml
@@ -34,14 +34,12 @@
 
 <bin file="gpuClustering_t.cu" name="gpuClustering_t">
   <use name="cuda"/>
-  <use name="cub"/>
   <use name="HeterogeneousCore/CUDAUtilities"/>
   <flags CXXFLAGS="-g"/>
 </bin>
 
 <bin file="gpuClustering_t.cu" name="gpuClustering_debug">
   <use name="cuda"/>
-  <use name="cub"/>
   <use name="HeterogeneousCore/CUDAUtilities"/>
   <flags CXXFLAGS="-g -DGPU_DEBUG"/>
   <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>