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

fwd-port HTXS to master #20683

Merged
merged 7 commits into from Dec 1, 2017
Merged

fwd-port HTXS to master #20683

merged 7 commits into from Dec 1, 2017

Conversation

perrozzi
Copy link
Contributor

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-20683/1021

Code check has found code style and quality issues which could be resolved by applying a patch in https://cmssdt.cern.ch/SDT/code-checks/PR-20683/1021/git-diff.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/PR-20683/1021/git-diff.patch | patch -p1

You can run scram build code-checks to apply code checks directly

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-20683/1022

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 28, 2017

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

It involves the following packages:

GeneratorInterface/RivetInterface
SimDataFormats/HTXS

The following packages do not have a category, yet:

SimDataFormats/HTXS
Please create a PR for https://github.com/cms-sw/cms-bot/blob/master/categories.py to assign category

@cmsbuild, @efeyazgan, @perrozzi, @thuer, @govoni can you please review it and eventually sign? Thanks.
@alberto-sanchez, @agrohsje, @mkirsano, @rovere this is something you requested to watch as well.
@davidlange6, @slava77 you are the release manager for this.

cms-bot commands are listed here

@perrozzi
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 28, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/23283/console Started: 2017/09/28 05:24

@cmsbuild
Copy link
Contributor

-1

Tested at: d70aa5c

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
897a3cf
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20683/23283/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20683/23283/git-merge-result

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20683/23283/summary.html

I found follow errors while testing this PR

Failed tests: Build ClangBuild

  • Build:

I found an error when building:

>> Compiling edm plugin /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/plugins/GenParticles2HepMCConverterHTXS.cc 
>> Compiling edm plugin /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/plugins/MergedGenParticleProducer.cc 
>> Compiling edm plugin /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/plugins/RivetAnalyzer.cc 
>> Compiling edm plugin /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/plugins/ParticleLevelProducer.cc 
/build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/plugins/GenParticles2HepMCConverterHTXS.cc: In member function 'virtual void GenParticles2HepMCConverterHTXS::produce(edm::Event&, const edm::EventSetup&)':
/build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/plugins/GenParticles2HepMCConverterHTXS.cc:228:39: error: no matching function for call to 'edm::Event::put(std::auto_ptr&, const char [10])'
   event.put(hepmc_product, "unsmeared");
                                       ^
In file included from /cvmfs/cms-ib.cern.ch/nweek-02491/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_9_4_X_2017-09-27-2300/src/FWCore/Framework/interface/stream/ProducingModuleAdaptorBase.h:36:0,
                 from /cvmfs/cms-ib.cern.ch/nweek-02491/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_9_4_X_2017-09-27-2300/src/FWCore/Framework/interface/stream/EDProducerAdaptorBase.h:24,
                 from /cvmfs/cms-ib.cern.ch/nweek-02491/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_9_4_X_2017-09-27-2300/src/FWCore/Framework/interface/stream/EDProducerAdaptor.h:24,

  • Clang:

I found a compilation error while trying to compile with clang:
I used this command:
scram b vclean && scram build -k -j 16 USER_CXXFLAGS='-fsyntax-only' COMPILER='llvm compile'

>> Compiling  /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/src/CMS_2013_I1224539_DIJET.cc 
>> Compiling  /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/src/HiggsTemplateCrossSections.cc 
Selected class -> HTXS::HiggsClassification for ROOT: HTXS::HiggsClassification
Selected class -> edm::Wrapper for ROOT: edm::Wrapper
>> Compiling LCG dictionary: tmp/slc6_amd64_gcc630/src/SimDataFormats/HTXS/src/SimDataFormatsHTXS/a/SimDataFormatsHTXS_xr.cc
/build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_4_X_2017-09-27-2300/src/GeneratorInterface/RivetInterface/plugins/GenParticles2HepMCConverterHTXS.cc:228:9: error: no matching member function for call to 'put'
  event.put(hepmc_product, "unsmeared");
  ~~~~~~^~~
/cvmfs/cms-ib.cern.ch/nweek-02491/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_9_4_X_2017-09-27-2300/src/FWCore/Framework/interface/Event.h:380:10: note: candidate template ignored: could not match 'unique_ptr' against 'auto_ptr'
  Event::put(std::unique_ptr product, std::string const& productInstanceName) {
         ^


The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
897a3cf
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20683/23283/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20683/23283/git-merge-result

@cmsbuild
Copy link
Contributor

Comparison not run due to Build errors (RelVals and Igprof tests were also skipped)

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 30, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/24057/console Started: 2017/10/30 19:03

@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-20683/24057/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 26
  • DQMHistoTests: Total histograms compared: 2838442
  • DQMHistoTests: Total failures: 117
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2838154
  • DQMHistoTests: Total skipped: 171
  • DQMHistoTests: Total Missing objects: 0
  • Checked 107 log files, 10 edm output root files, 26 DQM output files

@perrozzi
Copy link
Contributor Author

+1

@arizzi
Copy link
Contributor

arizzi commented Nov 3, 2017

@davidlange6 will this be taken for 940?

@arizzi
Copy link
Contributor

arizzi commented Nov 16, 2017

what's the fate of this PR? Can it be included in a 94x release? (if so, @perrozzi I guess you need to make a new PR against 94X branch)

@perrozzi
Copy link
Contributor Author

I am waiting for it to be merged... then sure I can do the backport

@arizzi
Copy link
Contributor

arizzi commented Nov 21, 2017

@perrozzi I think you only need to open the PR :
CMSSW_9_4_X...perrozzi:htxs_master

as the very same branch is mergeable on 94X too

@gpetruc
Copy link
Contributor

gpetruc commented Dec 1, 2017

I think it's the other way around, i.e. #21490 is the backport of this PR, since this PR is for master while #21490 is for 9_4_X

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 1, 2017

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. @davidlange6, @slava77, @smuzaffar (and backports should be raised in the release meeting by the corresponding L2)

@davidlange6
Copy link
Contributor

merge

@davidlange6
Copy link
Contributor

sorry that it took some extra time to come back to this one

@cmsbuild cmsbuild merged commit e2a792f into cms-sw:master Dec 1, 2017
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

8 participants