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

[cxxmodules] Workaround missing CLHEP modulemap. #28925

Merged
merged 2 commits into from
Feb 14, 2020

Conversation

vgvassilev
Copy link
Contributor

Currently all contents are pasted N times in the including modules due to the lack of a CLHEP module for the external to cmssw package.

This walks on a very fragile path in the compiler (and roocling) as it needs to figure out while parsing the header content that a module already contained the definitions being parsed.

This patch avoids an issue where rootcling thinks that CLHEP/.../ThreeVector.h is included multiple times. We essentially tell the compiler to open the definition from a module rather than parsing.

Part of #15248

cc: @davidlange6, @smuzaffar, @oshadura

@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/cms-sw-PR-28925/13724

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @vgvassilev (Vassil Vassilev) for master.

It involves the following packages:

DataFormats/BTauReco

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@emilbols, @smoortga, @acaudron, @rovere, @HeinerTholen, @JyothsnaKomaragiri, @mverzett, @ferencek, @andrzejnovak, @pvmulder this is something you requested to watch as well.
@davidlange6, @silviodonato, @fabiocos you are the release manager for this.

cms-bot commands are listed here

vgvassilev added a commit to vgvassilev/cmsdist that referenced this pull request Feb 11, 2020
@smuzaffar
Copy link
Contributor

Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 11, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4612/console Started: 2020/02/11 21:42

Currently all contents are pasted N times in the including modules due to the
lack of a CLHEP module for the external to cmssw package.

This walks on a very fragile path in the compiler (and roocling) as it needs to
figure out while parsing the header content that a module already contained the
definitions being parsed.

This patch avoids an issue where rootcling thinks that CLHEP/.../ThreeVector.h
is included multiple times. We essentially tell the compiler to open the
definition from a module rather than parsing.
@cmsbuild
Copy link
Contributor

-1

Tested at: c41612e

CMSSW: CMSSW_11_1_X_2020-02-11-1100
SCRAM_ARCH: slc7_amd64_gcc820

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ca565f/4612/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ca565f/4612/git-merge-result

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

I found follow errors while testing this PR

Failed tests: Build HeaderConsistency

  • Build:

I found compilation error when building:

>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_1_X_2020-02-11-1100/src/DataFormats/BTauReco/src/TemplatedSoftLeptonTagInfo.cc 
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_1_X_2020-02-11-1100/src/DataFormats/BTauReco/src/VertexTypes.cc 
>> Building LCG reflex dict from header file src/DataFormats/BTauReco/src/classes.h
>> Compiling LCG dictionary: tmp/slc7_amd64_gcc820/src/DataFormats/BTauReco/src/DataFormatsBTauReco/a/DataFormatsBTauReco_xr.cc
In file included from DataFormatsBTauReco/a/DataFormatsBTauReco_xr.cc:47:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_1_X_2020-02-11-1100/src/DataFormats/BTauReco/src/classes.h:18:18: error: missing binary operator before token "("
 #if __has_feature(modules)
                  ^
gmake: *** [tmp/slc7_amd64_gcc820/src/DataFormats/BTauReco/src/DataFormatsBTauReco/a/DataFormatsBTauReco_xr.cc.o] Error 1
>> Building shared library tmp/slc7_amd64_gcc820/src/DataFormats/BTauReco/src/DataFormatsBTauReco/libDataFormatsBTauReco.so
c++: error: tmp/slc7_amd64_gcc820/src/DataFormats/BTauReco/src/DataFormatsBTauReco/a/DataFormatsBTauReco_xr.cc.o: No such file or directory


The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ca565f/4612/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ca565f/4612/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

Pull request #28925 was updated. @perrotta, @cmsbuild, @slava77 can you please check and sign again.

@smuzaffar
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 12, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4615/console Started: 2020/02/12 09:14

@cmsbuild
Copy link
Contributor

+1
Tested at: d8f03f7
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ca565f/4615/summary.html
CMSSW: CMSSW_11_1_X_2020-02-11-2300
SCRAM_ARCH: slc7_amd64_gcc820

@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-ca565f/4615/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: 2694005
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2693658
  • DQMHistoTests: Total skipped: 346
  • 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

@slava77
Copy link
Contributor

slava77 commented Feb 12, 2020

+1

for #28925 d8f03f7

  • technical; looks in line with the description

@cmsbuild
Copy link
Contributor

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

vgvassilev added a commit to vgvassilev/cmssw that referenced this pull request Feb 12, 2020
In the same manner as in cms-sw#28925 we force the definition of
Hep3Vector to be read from the module that contains it rather than parsing it.
vgvassilev added a commit to vgvassilev/cmssw that referenced this pull request Feb 12, 2020
In the same manner as in cms-sw#28925 we force the definition of
Hep3Vector to be read from the module that contains it rather than parsing it.
@silviodonato
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 7211dca into cms-sw:master Feb 14, 2020
@vgvassilev vgvassilev deleted the cxxmodules_workaround_clhep branch February 14, 2020 10:06
davidlange6 pushed a commit to davidlange6/cmsdist that referenced this pull request Feb 17, 2020
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.

5 participants