Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update GPU HCAL conditions framework (#574)
Remove duplicate GPU-related HCAL conditions records, and simplify the package dependencies moving the remaining ones to CondFormats/DataRecord. Improve the handling of the GPU conditions payloads: - use cms::cuda::device::unique_ptr to automatically deallocate the memory; - use edm::propagate_const_array to ensure that the conditions data are not accidentally modified by client code; - use cms::cuda::copyAsync(...) to simplify the copy of the conditions to the device.
- Loading branch information
Showing
36 changed files
with
301 additions
and
570 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#ifndef CondFormats_DataRecord_interface_HcalCombinedRecordsGPU_h | ||
#define CondFormats_DataRecord_interface_HcalCombinedRecordsGPU_h | ||
|
||
#include "CondFormats/DataRecord/interface/HcalPedestalWidthsRcd.h" | ||
#include "CondFormats/DataRecord/interface/HcalPedestalsRcd.h" | ||
#include "CondFormats/DataRecord/interface/HcalQIEDataRcd.h" | ||
#include "CondFormats/DataRecord/interface/HcalQIETypesRcd.h" | ||
#include "FWCore/Framework/interface/DependentRecordImplementation.h" | ||
|
||
template <typename... Sources> | ||
class HcalCombinedRecord : public edm::eventsetup::DependentRecordImplementation<HcalCombinedRecord<Sources...>, | ||
edm::mpl::Vector<Sources...>> {}; | ||
|
||
using HcalConvertedPedestalsRcd = HcalCombinedRecord<HcalPedestalsRcd, HcalQIEDataRcd, HcalQIETypesRcd>; | ||
|
||
using HcalConvertedPedestalWidthsRcd = | ||
HcalCombinedRecord<HcalPedestalsRcd, HcalPedestalWidthsRcd, HcalQIEDataRcd, HcalQIETypesRcd>; | ||
|
||
#endif // CondFormats_DataRecord_interface_HcalCombinedRecordsGPU_h |
2 changes: 1 addition & 1 deletion
2
...HcalObjects/src/HcalCombinedRecordsGPU.cc → .../DataRecord/src/HcalCombinedRecordsGPU.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
#include "CondFormats/DataRecord/interface/HcalCombinedRecordsGPU.h" | ||
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" | ||
#include "CondFormats/HcalObjects/interface/HcalCombinedRecordsGPU.h" | ||
|
||
EVENTSETUP_RECORD_REG(HcalConvertedPedestalsRcd); | ||
EVENTSETUP_RECORD_REG(HcalConvertedPedestalWidthsRcd); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,15 @@ | ||
<ifrelease name="_UBSAN_"> | ||
<flags REM_CXXFLAGS="-fno-omit-frame-pointer -fsanitize=undefined"/> | ||
</ifrelease> | ||
<use name="boost_serialization"/> | ||
<use name="CondFormats/Serialization"/> | ||
<use name="DataFormats/DetId"/> | ||
<use name="DataFormats/HcalDetId"/> | ||
<use name="Geometry/CaloTopology"/> | ||
<use name="FWCore/Utilities"/> | ||
<use name="FWCore/MessageLogger"/> | ||
<use name="CondFormats/Serialization"/> | ||
<use name="FWCore/Utilities"/> | ||
<use name="Geometry/CaloTopology"/> | ||
<use name="HeterogeneousCore/CUDACore"/> | ||
<use name="HeterogeneousCore/CUDAUtilities"/> | ||
<use name="CondFormats/DataRecord"/> | ||
<use name="boost_serialization"/> | ||
<export> | ||
<lib name="1"/> | ||
</export> |
This file was deleted.
Oops, something went wrong.
20 changes: 0 additions & 20 deletions
20
CondFormats/HcalObjects/interface/HcalCombinedRecordsGPU.h
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.