Skip to content

Commit

Permalink
Merge pull request #37218 from makortel/cudaDataFormatsTransient
Browse files Browse the repository at this point in the history 
Make sure all dictionaries in CUDADataFormats are transient
  • Loading branch information
@cmsbuild
cmsbuild committed Mar 17, 2022
2 parents f909eef + 7512332 commit daf7aa2
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions CUDADataFormats/CaloCommon/src/classes_def.xml
View file
Expand Up @@ -2,7 +2,7 @@
<enum name="calo::common::tags::Ptr"/>
<enum name="calo::common::tags::Vec"/>
<enum name="calo::common::tags::DevPtr"/>
<class name="calo::common::AddSize<calo::common::tags::Ptr>"/>
<class name="calo::common::AddSize<calo::common::tags::Vec>"/>
<class name="calo::common::AddSize<calo::common::tags::DevPtr>"/>
<class name="calo::common::AddSize<calo::common::tags::Ptr>" persistent="false"/>
<class name="calo::common::AddSize<calo::common::tags::Vec>" persistent="false"/>
<class name="calo::common::AddSize<calo::common::tags::DevPtr>" persistent="false"/>
</lcgdict>
28 changes: 14 additions & 14 deletions CUDADataFormats/HcalDigi/src/classes_def.xml
View file
@@ -1,14 +1,14 @@
<lcgdict>
<class name="hcal::DigiCollectionBase<calo::common::VecStoragePolicy<std::allocator>>" />
<class name="hcal::DigiCollectionBase<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" />
<class name="hcal::DigiCollectionBase<calo::common::VecStoragePolicy<std::allocator>>" persistent="false" />
<class name="hcal::DigiCollectionBase<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false" />

<class name="hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<std::allocator>>" />
<class name="hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<std::allocator>>" />
<class name="hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<std::allocator>>" />
<class name="hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<std::allocator>>" persistent="false" />
<class name="hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<std::allocator>>" persistent="false" />
<class name="hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<std::allocator>>" persistent="false" />

<class name="hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" />
<class name="hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" />
<class name="hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" />
<class name="hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false" />
<class name="hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false" />
<class name="hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false" />

<class name="cms::cuda::Product<hcal::DigiCollection<hcal::Flavor1, calo::common::ViewStoragePolicy>>" persistent="false" />
<class name="cms::cuda::Product<hcal::DigiCollection<hcal::Flavor3, calo::common::ViewStoragePolicy>>" persistent="false" />
Expand All @@ -26,11 +26,11 @@
<class name="edm::Wrapper<cms::cuda::Product<hcal::DigiCollection<hcal::Flavor3, calo::common::DevStoragePolicy>>>" persistent="false" />
<class name="edm::Wrapper<cms::cuda::Product<hcal::DigiCollection<hcal::Flavor5, calo::common::DevStoragePolicy>>>" persistent="false" />

<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<std::allocator>>>" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<std::allocator>>>" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<std::allocator>>>" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<std::allocator>>>" persistent="false" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<std::allocator>>>" persistent="false" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<std::allocator>>>" persistent="false" />

<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" persistent="false" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" persistent="false" />
<class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" persistent="false" />
</lcgdict>
8 changes: 4 additions & 4 deletions CUDADataFormats/HcalRecHitSoA/src/classes_def.xml
View file
@@ -1,9 +1,9 @@
<lcgdict>
<class name="hcal::RecHitCollection<calo::common::VecStoragePolicy<std::allocator>>"/>
<class name="edm::Wrapper<hcal::RecHitCollection<calo::common::VecStoragePolicy<std::allocator>>>"/>
<class name="hcal::RecHitCollection<calo::common::VecStoragePolicy<std::allocator>>" persistent="false"/>
<class name="edm::Wrapper<hcal::RecHitCollection<calo::common::VecStoragePolicy<std::allocator>>>" persistent="false"/>

<class name="hcal::RecHitCollection<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>"/>
<class name="edm::Wrapper<hcal::RecHitCollection<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>"/>
<class name="hcal::RecHitCollection<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false"/>
<class name="edm::Wrapper<hcal::RecHitCollection<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" persistent="false"/>

<class name="cms::cuda::Product<hcal::RecHitCollection<calo::common::ViewStoragePolicy>>" persistent="false" />
<class name="edm::Wrapper<cms::cuda::Product<hcal::RecHitCollection<calo::common::ViewStoragePolicy>>>" persistent="false" />
Expand Down
18 changes: 9 additions & 9 deletions CUDADataFormats/StdDictionaries/src/classes_def.xml
View file
@@ -1,14 +1,14 @@
<lcgdict>
<class name="std::vector<std::byte, cms::cuda::HostAllocator<std::byte, 0>>" />
<class name="std::vector<std::byte, cms::cuda::HostAllocator<std::byte, 0>>" persistent="false"/>

<class name="std::vector<uint8_t, cms::cuda::HostAllocator<uint8_t, 0>>" />
<class name="std::vector<uint16_t, cms::cuda::HostAllocator<uint16_t, 0>>" />
<class name="std::vector<uint32_t, cms::cuda::HostAllocator<uint32_t, 0>>" />
<class name="std::vector<uint8_t, cms::cuda::HostAllocator<uint8_t, 0>>" persistent="false"/>
<class name="std::vector<uint16_t, cms::cuda::HostAllocator<uint16_t, 0>>" persistent="false"/>
<class name="std::vector<uint32_t, cms::cuda::HostAllocator<uint32_t, 0>>" persistent="false"/>

<class name="std::vector<int8_t, cms::cuda::HostAllocator<int8_t, 0>>" />
<class name="std::vector<int16_t, cms::cuda::HostAllocator<int16_t, 0>>" />
<class name="std::vector<int32_t, cms::cuda::HostAllocator<int32_t, 0>>" />
<class name="std::vector<int8_t, cms::cuda::HostAllocator<int8_t, 0>>" persistent="false"/>
<class name="std::vector<int16_t, cms::cuda::HostAllocator<int16_t, 0>>" persistent="false"/>
<class name="std::vector<int32_t, cms::cuda::HostAllocator<int32_t, 0>>" persistent="false"/>

<class name="std::vector<float, cms::cuda::HostAllocator<float, 0>>" />
<class name="std::vector<double, cms::cuda::HostAllocator<double, 0>>" />
<class name="std::vector<float, cms::cuda::HostAllocator<float, 0>>" persistent="false"/>
<class name="std::vector<double, cms::cuda::HostAllocator<double, 0>>" persistent="false"/>
</lcgdict>

0 comments on commit daf7aa2

Please sign in to comment.