Reduce CA memory need (cms-sw#159)

felicepantaleo · Sep 5, 2018 · 1fdc54a · 1fdc54a
1 parent 748b5a7
commit 1fdc54a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.cu b/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.cu
@@ -13,7 +13,7 @@ using HitsOnCPU = siPixelRecHitsHeterogeneousProduct::HitsOnCPU;
 __global__ void
 kernel_checkOverflows(GPU::SimpleVector<Quadruplet> *foundNtuplets,
                GPUCACell *cells, uint32_t const * nCells,
-               GPU::VecArray< unsigned int, 2048> *isOuterHitOfCell,
+               GPU::VecArray< unsigned int, 256> *isOuterHitOfCell,
                uint32_t nHits) {
 
  auto idx = threadIdx.x + blockIdx.x * blockDim.x;
@@ -37,7 +37,7 @@ kernel_checkOverflows(GPU::SimpleVector<Quadruplet> *foundNtuplets,
 __global__ void
 kernel_connect(GPU::SimpleVector<Quadruplet> *foundNtuplets,
                GPUCACell *cells, uint32_t const * nCells,
-               GPU::VecArray< unsigned int, 2048> *isOuterHitOfCell,
+               GPU::VecArray< unsigned int, 256> *isOuterHitOfCell,
                float ptmin, 
                float region_origin_radius, const float thetaCut,
                const float phiCut, const float hardPtCut,

diff --git a/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.h b/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.h
@@ -151,14 +151,13 @@ class CAHitQuadrupletGeneratorGPU {
     const float caHardPtCut = 0.f;
 
     static constexpr int maxNumberOfQuadruplets_ = 10000;
-    static constexpr int maxCellsPerHit_ = 2048; // 512;
+    static constexpr int maxCellsPerHit_ = 256; // 2048; // 512;
     static constexpr int maxNumberOfLayerPairs_ = 13;
     static constexpr int maxNumberOfLayers_ = 10;
     static constexpr int maxNumberOfDoublets_ = 262144;
     static constexpr int maxNumberOfHits_ = 20000;
     static constexpr int maxNumberOfRegions_ = 2;
 
-
     std::vector<GPU::SimpleVector<Quadruplet>*> h_foundNtupletsVec_;
     std::vector<Quadruplet*> h_foundNtupletsData_;
 

diff --git a/RecoPixelVertexing/PixelTriplets/plugins/gpuPixelDoublets.h b/RecoPixelVertexing/PixelTriplets/plugins/gpuPixelDoublets.h
@@ -23,7 +23,7 @@ namespace gpuPixelDoublets {
   void doubletsFromHisto(uint8_t const * layerPairs, uint32_t nPairs, GPUCACell * cells, uint32_t * nCells,
                          int16_t const * iphi, Hist const * hist, uint32_t const * offsets,
                          siPixelRecHitsHeterogeneousProduct::HitsOnGPU const & hh,
-                         GPU::VecArray< unsigned int, 2048>  * isOuterHitOfCell,
+                         GPU::VecArray< unsigned int, 256>  * isOuterHitOfCell,
                          int16_t const * phicuts, float const * minz, float const * maxz, float const * maxr) {
 
     auto layerSize = [=](uint8_t li) { return offsets[li+1]-offsets[li]; };
@@ -125,7 +125,7 @@ namespace gpuPixelDoublets {
   }
   __global__
   void getDoubletsFromHisto(GPUCACell * cells, uint32_t * nCells, siPixelRecHitsHeterogeneousProduct::HitsOnGPU const * hhp,                
-                            GPU::VecArray< unsigned int, 2048> *isOuterHitOfCell) {
+                            GPU::VecArray< unsigned int, 256> *isOuterHitOfCell) {
 
     uint8_t const layerPairs[2*13] = {0,1 ,1,2 ,2,3 
                                      // ,0,4 ,1,4 ,2,4 ,4,5 ,5,6