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

[Vincia] Updates to version 2.3.02 which addresses compiler warnings #5384

Merged
merged 1 commit into from Dec 3, 2019

Conversation

smuzaffar
Copy link
Contributor

We have many warnings in cmssw which are coming from vincia. The new version 2.3.02 addresses these warnings.

[a]

  vincia/2.3.01/include/Pythia8/VinciaCommon.h:183:7: warning: 'class Pythia8::TFunctor' has virtual functions and accessible non-virtual destructor [-Wnon-virtual-dtor]
  class TFunctor {
       ^~~~~~~~
  vincia/2.3.01/include/Pythia8/VinciaCommon.h:188:7: warning: base class 'class Pythia8::TFunctor' has accessible non-virtual destructor [-Wnon-virtual-dtor]
  class TXiFunctor : public TFunctor {
       ^~~~~~~~~~
  vincia/2.3.01/include/Pythia8/VinciaCommon.h:188:7: warning: 'class Pythia8::TXiFunctor' has virtual functions and accessible non-virtual destructor [-Wnon-virtual-dtor]
   vincia/2.3.01/include/Pythia8/VinciaCommon.h:199:7: warning: base class 'class Pythia8::TFunctor' has accessible non-virtual destructor [-Wnon-virtual-dtor]
  class TPtrFunctor : public TFunctor {
       ^~~~~~~~~~~
  vincia/2.3.01/include/Pythia8/VinciaCommon.h:199:7: warning: 'class Pythia8::TPtrFunctor' has virtual functions and accessible non-virtual destructor [-Wnon-virtual-dtor]
 In file included from vincia/2.3.01/include/Pythia8/VinciaFSR.h:15,
                 from vincia/2.3.01/include/Pythia8/Vincia.h:25,
                 from GeneratorInterface/Pythia8Interface/plugins/Pythia8Hadronizer.cc:14:
  vincia/2.3.01/include/Pythia8/VinciaISR.h:36:7: warning: 'class Pythia8::TrialGeneratorISR' has virtual functions and accessible non-virtual destructor [-Wnon-virtual-dtor]
  class TrialGeneratorISR {
       ^~~~~~~~~~~~~~~~~
  vincia/2.3.01/include/Pythia8/VinciaISR.h:163:7: warning: base class 'class Pythia8::TrialGeneratorISR' has accessible non-virtual destructor [-Wnon-virtual-dtor]
  class TrialIISoft : public TrialGeneratorISR {

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @smuzaffar (Malik Shahzad Muzaffar) for branch IB/CMSSW_11_0_X/master.

@cmsbuild, @smuzaffar, @mrodozov can you please review it and eventually sign? Thanks.
cms-bot commands are listed here

@smuzaffar
Copy link
Contributor Author

assign generators

@cmsbuild
Copy link
Contributor

New categories assigned: generators

@alberto-sanchez,@SiewYan,@qliphy,@efeyazgan,@mkirsano,@agrohsje you have been requested to review this Pull request/Issue and eventually sign? Thanks

@smuzaffar
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 27, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/3663/console Started: 2019/11/27 11:59

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-2b6eed/3663/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2793840
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2793498
  • DQMHistoTests: Total skipped: 341
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 147 log files, 16 edm output root files, 34 DQM output files

@smuzaffar smuzaffar changed the title [Vincia] Updates to version 2.3.02 which contains address compiler warnings [Vincia] Updates to version 2.3.02 which addresses compiler warnings Nov 28, 2019
@smuzaffar smuzaffar changed the base branch from IB/CMSSW_11_0_X/master to IB/CMSSW_11_1_X/master December 2, 2019 10:49
@fabiocos
Copy link
Contributor

fabiocos commented Dec 3, 2019

@SiewYan @qliphy @agohsje comments/objections?

@smuzaffar
Copy link
Contributor Author

please note that beside the trivial warning fix for non-virtual destructor (addign missing destructor) this version also contains fix for variable shadow warning [a]

[a]

--- vincia-2.3.01/src/VinciaISR.cc      2019-09-18 08:30:12.000000000 +0200
+++ vincia-2.3.02/src/VinciaISR.cc      2019-11-26 11:58:40.000000000 +0100
@@ -2972,10 +2972,8 @@
           // Set PDFratio
           // If II the first is always side A
           // If IF check which side the initial guy is
-          BeamParticle* beamAPtr = ( (isII || is1A) ? beamPosPtr :
-            beamNegPtr );
-          BeamParticle* beamBPtr = ( (isII || is1A) ? beamNegPtr :
-            beamPosPtr );
+          beamAPtr = ( (isII || is1A) ? beamPosPtr : beamNegPtr );
+          beamBPtr = ( (isII || is1A) ? beamNegPtr : beamPosPtr );
           // For g->qq splittings, use
           double PDFscale = pow2(qTrial);
           double pdfRatio = trialGenPtr->trialPDFratio(beamAPtr, beamBPtr,

@SiewYan
Copy link
Contributor

SiewYan commented Dec 3, 2019

@fabiocos , fine with us

@SiewYan
Copy link
Contributor

SiewYan commented Dec 3, 2019

+1

@smuzaffar
Copy link
Contributor Author

+externals

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 3, 2019

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

@fabiocos
Copy link
Contributor

fabiocos commented Dec 3, 2019

+1

@cmsbuild cmsbuild merged commit 19696a6 into IB/CMSSW_11_1_X/master Dec 3, 2019
@smuzaffar smuzaffar deleted the smuzaffar-patch-1 branch December 7, 2019 23:07
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

4 participants