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 ODR problems and includes in Selections.h #19353

Merged
merged 1 commit into from Jun 28, 2017

Conversation

Teemperor
Copy link
Contributor

We include MessageLogger.h because we use edm::LogVerbatim in this
header and this way it can compile on its own.

We renamed Selection to FilterSelection because we already have
a Selection class in CommonTools/Utils/interface/Selection.h,
which is breaking the One Definition Rule and breaks the C++
modules builds (and can also break the normal CMSSW builds).

@Teemperor
Copy link
Contributor Author

Part of the work going on regarding the C++ modules migration of CMSSW (tracked as issue #15248). This PR is not meant to refactor things, but just to make these headers compile.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Teemperor (Raphael Isemann) for master.

It involves the following packages:

PhysicsTools/UtilAlgos

@cmsbuild, @monttj, @davidlange6 can you please review it and eventually sign? Thanks.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

@davidlange6
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 19, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/20753/console Started: 2017/06/19 19:07

@cmsbuild
Copy link
Contributor

-1

Tested at: 3d88305

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-19353/20753/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_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/plugins/ConfigurableAnalysis.cc 
>> Compiling edm plugin /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/plugins/NTuplingDevice.cc 
>> Compiling edm plugin /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/plugins/PrimaryVertexFilter.cc 
In file included from /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/plugins/ConfigurableAnalysis.cc:36:0:
/build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/interface/Selections.h: In constructor 'FilterSelections::FilterSelections(const edm::ParameterSet&, edm::ConsumesCollector&&)':
/build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/interface/Selections.h:389:22: error: 'Selection' was not declared in this scope
     for (std::vector::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt){
                      ^
/build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/interface/Selections.h:389:31: error: template argument 1 is invalid
     for (std::vector::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt){
                               ^

  • 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_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/src/BasicMuonAnalyzer.cc 
>> Compiling  /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/src/StringBasedNTupler.cc 
>> Compiling  /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/bin/FWLiteWithBasicAnalyzer.cc 
>> Compiling  /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/bin/mergeTFileServiceHistograms.cpp 
In file included from /build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/plugins/ConfigurableAnalysis.cc:36:
/build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/interface/Selections.h:389:22: error: use of undeclared identifier 'Selection'
    for (std::vector::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt){
                     ^
/build/cmsbld/jenkins-workarea/workspace/ib-any-integration/CMSSW_9_2_X_2017-06-19-1100/src/PhysicsTools/UtilAlgos/interface/Selections.h:389:32: error: no type named 'iterator' in the global namespace; did you mean simply 'iterator'?
    for (std::vector::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt){
                               ^~~~~~~~~~


@cmsbuild
Copy link
Contributor

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

We include MessageLogger.h because we use edm::LogVerbatim in this
header and this way it can compile on its own.

We renamed Selection to FilterSelection because we already have
a Selection class in CommonTools/Utils/interface/Selection.h,
which is breaking the One Definition Rule and breaks the C++
modules builds (and can also break the normal CMSSW builds).
@cmsbuild
Copy link
Contributor

Pull request #19353 was updated. @cmsbuild, @monttj, @davidlange6 can you please check and sign again.

@Teemperor
Copy link
Contributor Author

Fixed compilation errors.

@davidlange6
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 20, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/20775/console Started: 2017/06/20 10:43

@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-19353/20775/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 22
  • DQMHistoTests: Total histograms compared: 1803260
  • DQMHistoTests: Total failures: 44267
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1758827
  • DQMHistoTests: Total skipped: 166
  • DQMHistoTests: Total Missing objects: 0
  • Checked 90 log files, 14 edm output root files, 22 DQM output files

@davidlange6
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit c475a3a into cms-sw:master Jun 28, 2017
@Teemperor Teemperor deleted the FixSelection.h branch December 19, 2017 08:47
@Teemperor Teemperor restored the FixSelection.h branch December 19, 2017 10:43
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