Further clean up the CA ntuplet generator #610
Merged
Conversation
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 PR tries to address the last few comments from https://github.com/cms-sw/cmssw/pull/31722/files#diff-eadc36519665df48f9724340a6037730e07f8d896606bdf89707acb65a368736 . |
fwyzard
commented
Mar 24, 2021
Comment on lines
-21
to
+25
| // in principle we can use "nhits" to heuristically dimension the workspace... | ||
| // overkill to use template here (std::make_unique would suffice) | ||
| // device_isOuterHitOfCell_ = Traits:: template make_unique<GPUCACell::OuterHitOfCell[]>(cs, std::max(1U,nhits), stream); | ||
| device_isOuterHitOfCell_.reset( | ||
| (GPUCACell::OuterHitOfCell *)malloc(std::max(1U, nhits) * sizeof(GPUCACell::OuterHitOfCell))); | ||
| // use "nhits" to heuristically dimension the workspace | ||
|
|
||
| // no need to use the Traits allocations, since we know this is being compiled for the CPU | ||
| //device_isOuterHitOfCell_ = Traits::template make_unique<GPUCACell::OuterHitOfCell[]>(std::max(1U, nhits), stream); | ||
| device_isOuterHitOfCell_ = std::make_unique<GPUCACell::OuterHitOfCell[]>(std::max(1U, nhits)); |
There was a problem hiding this comment.
I think I've fixed the commented out allocations as well (at least, they compile now), and I've changed the used ones from malloc to make_unique (to be on the safe side, in case new were to do something different than plain malloc).
@VinInn do you prefer to keep the commented out version ?
There was a problem hiding this comment.
fine for the time being. Once we will have an agreed heterogeneous allocator it will be changed together all other instances....
Validation summaryReference release CMSSW_11_3_0_pre5 at 23fad57 Validation plots/RelValTTbar_14TeV/CMSSW_11_2_0-PU_112X_mcRun3_2021_realistic_v14-v1/GEN-SIM-DIGI-RAW
/RelValZMM_14/CMSSW_11_2_0-112X_mcRun3_2021_realistic_v14-v1/GEN-SIM-DIGI-RAW
/RelValZEE_14/CMSSW_11_2_0-112X_mcRun3_2021_realistic_v13-v1/GEN-SIM-DIGI-RAW
Validation plots (CPU vs GPU)/RelValTTbar_14TeV/CMSSW_11_2_0-PU_112X_mcRun3_2021_realistic_v14-v1/GEN-SIM-DIGI-RAW
/RelValZMM_14/CMSSW_11_2_0-112X_mcRun3_2021_realistic_v14-v1/GEN-SIM-DIGI-RAW
/RelValZEE_14/CMSSW_11_2_0-112X_mcRun3_2021_realistic_v13-v1/GEN-SIM-DIGI-RAW
Throughput plots/EphemeralHLTPhysics1/Run2018D-v1/RAW run=323775 lumi=53
logs and
|
fwyzard
added a commit
that referenced
this pull request
Mar 24, 2021
fwyzard
added a commit
that referenced
this pull request
Apr 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.