Skip to content

Commit

Permalink
Rename CUDAHostAllocator to cms::cuda::HostAllocator (#464)
Browse files Browse the repository at this point in the history
  • Loading branch information
fwyzard committed Nov 6, 2020
1 parent 3509f94 commit 4284d85
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define RecoLocalTracker_SiPixelClusterizer_SiPixelFedCablingMapGPUWrapper_h

#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
#include "HeterogeneousCore/CUDAUtilities/interface/CUDAHostAllocator.h"
#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
#include "RecoLocalTracker/SiPixelClusterizer/interface/SiPixelFedCablingMapGPU.h"

Expand Down Expand Up @@ -34,7 +34,7 @@ class SiPixelFedCablingMapGPUWrapper {

private:
const SiPixelFedCablingMap *cablingMap_;
std::vector<unsigned char, CUDAHostAllocator<unsigned char>> modToUnpDefault;
std::vector<unsigned char, cms::cuda::HostAllocator<unsigned char>> modToUnpDefault;
unsigned int size;
bool hasQuality_;

Expand Down
4 changes: 2 additions & 2 deletions RecoLocalTracker/SiPixelRecHits/interface/PixelCPEFast.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "CondFormats/SiPixelTransient/interface/SiPixelGenError.h"
#include "CondFormats/SiPixelTransient/interface/SiPixelTemplate.h"
#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
#include "HeterogeneousCore/CUDAUtilities/interface/CUDAHostAllocator.h"
#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
#include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h"
#include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforGPU.h"

Expand Down Expand Up @@ -82,7 +82,7 @@ class PixelCPEFast final : public PixelCPEBase {

// allocate it with posix malloc to be ocmpatible with cpu wf
std::vector<pixelCPEforGPU::DetParams> m_detParamsGPU;
// std::vector<pixelCPEforGPU::DetParams, CUDAHostAllocator<pixelCPEforGPU::DetParams>> m_detParamsGPU;
// std::vector<pixelCPEforGPU::DetParams, cms::cuda::HostAllocator<pixelCPEforGPU::DetParams>> m_detParamsGPU;
pixelCPEforGPU::CommonParams m_commonParamsGPU;
pixelCPEforGPU::LayerGeometry m_layerGeometry;
pixelCPEforGPU::AverageGeometry m_averageGeometry;
Expand Down

0 comments on commit 4284d85

Please sign in to comment.