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

minimal fix to use rep, not position.eta/phi #14057

Merged
merged 1 commit into from Apr 26, 2016

Conversation

VinInn
Copy link
Contributor

@VinInn VinInn commented Apr 14, 2016

very minimal change.
major speedup
NO regression.
8_1_X version produces regression due to the consistent use of double

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @VinInn (Vincenzo Innocente) for CMSSW_8_0_X.

It involves the following packages:

RecoParticleFlow/PFClusterProducer

@cmsbuild, @cvuosalo, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@mmarionncern, @rafaellopesdesa, @bachtis, @lgray this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@VinInn
Copy link
Contributor Author

VinInn commented Apr 14, 2016

@cmsbuild, please test

@VinInn
Copy link
Contributor Author

VinInn commented Apr 14, 2016

@fwyzard , this is for HLT

@cmsbuild
Copy link
Contributor

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/12359/console

@VinInn VinInn changed the title minimal fix to use rep non position minimal fix to use rep, not position.eta/phi Apr 14, 2016
@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

@slava77
Copy link
Contributor

slava77 commented Apr 15, 2016

it may be better to put this to 81X as well first; so that auto-forward-port doesn't bring surprises depending on the time order of #14058 merging (it will either make 14058 not mergeable or may even modify something out of order if 14058 is merged first .. it's unclear if the context lines are fully overlapping or not)

@VinInn
Copy link
Contributor Author

VinInn commented Apr 16, 2016

This is NOT supposed to be autoforwarded.
It will cause merging issue with #14058.
You can leave it pending while reviewing #14058.
It just demonstrates the silly origin of the regression observed there.

@slava77
Copy link
Contributor

slava77 commented Apr 18, 2016

@VinInn
forward port is automated
we can't stop it unless we generate an anti-commit or have the same commit in 81X

@VinInn
Copy link
Contributor Author

VinInn commented Apr 19, 2016

@slava77 , ok keep this as an alternative to #14058.
If CMS decides that #14058 (and future PR about slimming PFRecHit) are not suited for backport
we integrate this and solve merge issues in 81X,
if instead we go on with full backport we will close this one.

@davidlt
Copy link
Contributor

davidlt commented Apr 19, 2016

We can block back port by merging manually with -s ours into CMSSW_8_1_X. That basically will import the history, but no changes. So basically doing so trashes the history.

@cvuosalo
Copy link
Contributor

+1

For #14057 3d23244

Speeding up PFCluster computations. There should be no change in monitored quantities.

This PR has some overlap with the already merged #14058 for 81X.

The code changes are satisfactory, and Jenkins tests against baseline CMSSW_8_0_X_2016-04-13-1100 show no significant differences, as expected. An extended test of workflow 25202.0_TTbar_13 with 70 events against baseline CMSSW_8_0_X_2016-04-12-2300 also shows no significant differences. Overall CPU time and memory use do not change significantly, but there is timing improvement in the affected modules (times exclude first event):

  delta/mean delta/orJob     original                   new       module name
  ---------- ------------     --------                  ----       ------------
   -1.518303      -0.01%         9.33 ms/ev ->         1.28 ms/ev hltParticleFlowClusterHCALForEgamma
   -1.517276      -0.01%         9.25 ms/ev ->         1.27 ms/ev hltParticleFlowClusterHCALForMuons
   -1.513000      -0.01%         9.27 ms/ev ->         1.29 ms/ev hltParticleFlowClusterHCAL
   -1.499091      -0.01%         7.45 ms/ev ->         1.07 ms/ev hltParticleFlowClusterHCALForTkMuons
   -1.496918      -0.04%         7.44 ms/ev ->         1.07 ms/ev particleFlowClusterHCAL
   -0.912711      -0.06%        15.13 ms/ev ->         5.65 ms/ev particleFlow
  ---------- ------------     --------                  ----       ------------

Another time measure also shows improvement:

    particleFlowClusterHCAL      4.81418 ms/ev -> 0.756229 ms/ev

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@VinInn
Copy link
Contributor Author

VinInn commented Apr 23, 2016

I suggest not to merge this in 8_0_X for the time being. At some point we need to understand if and when to backport all HLT speed ups currently in 8_1_X taking into account that some small regression will anyhow be present in reco as well

@davidlange6 davidlange6 merged commit 0c392d2 into cms-sw:CMSSW_8_0_X Apr 26, 2016
@VinInn
Copy link
Contributor Author

VinInn commented Apr 27, 2016

This is not supposed to be forward ported!

@slava77
Copy link
Contributor

slava77 commented Apr 27, 2016

I think that there are enough context lines to not let this go through to 81X
... the bot haven't done any 80X=>81X merges in a while now.
@smuzaffar please clarify if something is in the way

@davidlt
Copy link
Contributor

davidlt commented Apr 27, 2016

@slava77 there is a merge conflict (CalibTracker/SiStripDCS) since tomorrow's late evening, which needs to resolved.

@smuzaffar
Copy link
Contributor

@slava77 and @davidlt , conflicts are now resolved. changes from this PR are not forward ported

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.

None yet

7 participants