Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix logic in PFClusterSoAProducer kernels #44273

Merged
merged 1 commit into from
Mar 1, 2024

Conversation

jsamudio
Copy link
Contributor

PR description:

This PR fixes an issue with the clustering logic in PFClusterSoAProducer. The issue was highlighted by 2024 thresholds giving rise to topological clusters exceeding 100 seeds, which we had never naturally encountered in previous validations of the code in order to catch this flaw. The fall-back kernel was not being launched as intended in the previous logic, and is now changed to behave as intended.

PR validation:

For CPU-serial and GPU alpaka backends:
Validated QCDPU sample on 2022, 2023, and 2024 globalTag thresholds, and validated change in Pixel+ECAL+PF Alpaka HLT test workflow.

Cluster-level validation plots can be found here: https://hep.baylor.edu/jsamudio/fixLogic/

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

Not a backport, but probably needs to be included in 14_0_0 or later 14_0_X for HLT integration. Although I am not sure how to proceed since the 14_0_0 release is closed.

@hatakeyamak @waredjeb @fwyzard @swagata87 @stahlleiton

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 29, 2024

cms-bot internal usage

@@ -1429,7 +1429,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
int nRHTopo = pfClusteringVars[topoId].topoRHCount();
int nSeeds = pfClusteringVars[topoId].topoSeedCount();

if (nRHTopo > 0 && nSeeds > 400 && nRHTopo - nSeeds > 1500) {
// nSeeds value must match multiSeedIterative in FastCluster
if (nRHTopo > 0 && nSeeds > 400) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be

Suggested change
if (nRHTopo > 0 && nSeeds > 400) {
if (nRHTopo > 0 && nSeeds > 400 || nRHTopo - nSeeds > 1500) {

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-44273/39290

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @jsamudio for master.

It involves the following packages:

  • RecoParticleFlow/PFClusterProducer (reconstruction)

@cmsbuild, @jfernan2, @mandrenguyen can you please review it and eventually sign? Thanks.
@seemasharmafnal, @lgray, @sameasy, @mmarionncern, @felicepantaleo, @hatakeyamak, @rovere, @missirol this is something you requested to watch as well.
@antoniovilela, @rappoccio, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

Add non-seed rechit condition in exotic clustering
@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-44273/39293

  • This PR adds an extra 20KB to repository

@cmsbuild
Copy link
Contributor

Pull request #44273 was updated. @mandrenguyen, @jfernan2, @cmsbuild can you please check and sign again.

@jsamudio
Copy link
Contributor Author

jsamudio commented Feb 29, 2024

test parameters:

  • enable = gpu
  • workflows = 12434.422,12434.423,12434.424,12434.492
  • workflows_gpu = 12434.422,12434.423,12434.424,12434.492
  • workflow_opts = -w upgrade
  • workflow_opts_gpu = -w upgrade

@hatakeyamak
Copy link
Contributor

Maybe somebody can trigger jenkins?

@mandrenguyen
Copy link
Contributor

please test

@fwyzard
Copy link
Contributor

fwyzard commented Feb 29, 2024

type bugfix

@fwyzard
Copy link
Contributor

fwyzard commented Feb 29, 2024

urgent

the backport is needed for data taking

@fwyzard
Copy link
Contributor

fwyzard commented Feb 29, 2024

allow @jsamudio test rights

@fwyzard
Copy link
Contributor

fwyzard commented Feb 29, 2024

(in case it needs to be updated and re-tested)

@missirol
Copy link
Contributor

test parameters:

  • enable = gpu

  • workflows = 12434.422,12434.423,12434.424,12434.492

  • workflows_gpu = 12434.422,12434.423,12434.424,12434.492

  • workflow_opts = -w upgrade

  • workflow_opts_gpu = -w upgrade

I don't think the bot picked up #44273 (comment) (maybe because not done by ORP/L2s and only before @jsamudio was given rights). The bot should give a thumbs-up when it receives it.

@jsamudio
Copy link
Contributor Author

@cmsbuild, please abort

@jsamudio
Copy link
Contributor Author

jsamudio commented Feb 29, 2024

@cmsbuild, test parameters:

  • enable = gpu
  • workflows = 12434.422,12434.423,12434.424,12434.492
  • workflows_gpu = 12434.422,12434.423,12434.424,12434.492
  • workflow_opts = -w upgrade
  • workflow_opts_gpu = -w upgrade

@jsamudio
Copy link
Contributor Author

@cmsbuild, please test

@swagata87
Copy link
Contributor

type pf

@cmsbuild cmsbuild added the pf label Mar 1, 2024
@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 1, 2024

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-befbd6/37840/summary.html
COMMIT: 8d6e1dd
CMSSW: CMSSW_14_1_X_2024-02-29-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/44273/37840/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially added 3 lines to the logs
  • Reco comparison results: 53 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3338784
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3338756
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 205 log files, 166 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@fwyzard
Copy link
Contributor

fwyzard commented Mar 1, 2024

assign heterogeneous

@fwyzard
Copy link
Contributor

fwyzard commented Mar 1, 2024

+heterogeneous

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 1, 2024

New categories assigned: heterogeneous

@fwyzard,@makortel you have been requested to review this Pull request/Issue and eventually sign? Thanks

@mandrenguyen
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 1, 2024

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @sextonkennedy, @antoniovilela, @rappoccio (and backports should be raised in the release meeting by the corresponding L2)

@antoniovilela
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 0d05219 into cms-sw:master Mar 1, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants