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.

Sign up for GitHub

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

Jump to bottom

Attempt to fix compilation warnings and optimize usage of VecGeom #7821

Merged
merged 2 commits into from
Apr 28, 2022
Merged

Attempt to fix compilation warnings and optimize usage of VecGeom #7821

merged 2 commits into from
Apr 28, 2022

Conversation

civanch
Copy link
Contributor

@civanch civanch commented Apr 26, 2022 •
edited
Loading

Currently in any local compilation there is a warning related to VecGeom and Geant4:

warning: "G4GEOM_USE_USOLIDS" redefined
34 | #define G4GEOM_USE_USOLIDS
: note: this is the location of the previous definition

There is no run time problems but this warning means some inconsistency of compilation options.

This PR is an attempt to remove it and also to remove G4CutTubs problem within the same version of VecGeom 1.1.18

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @civanch (Vladimir Ivantchenko) for branch IB/CMSSW_12_4_X/geant4_vecgeom.

@cmsbuild, @smuzaffar, @aandvalenzuela, @iarspider can you please review it and eventually sign? Thanks.
@perrotta, @dpiparo, @qliphy you are the release manager for this.
cms-bot commands are listed here

@civanch
Copy link
Contributor Author

civanch commented Apr 26, 2022

@smuzaffar , if this PR will be OK it may substitute #7735

@smuzaffar
Copy link
Contributor

test parameters:

  • full_cmssw = true

@smuzaffar
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-baf219/24223/summary.html
COMMIT: f7c67e1
CMSSW: CMSSW_12_4_G4VECGEOM_X_2022-04-25-2300/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/7821/24223/install.sh to create a dev area with all the needed externals and cmssw changes.

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-baf219/24223/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-baf219/24223/git-merge-result

Build

I found compilation error when building:

>> Building  big object file tmp/slc7_amd64_gcc10/src/SimG4CMS/Calo/plugins/SimG4CMSCaloPlugins/bigobj/SimG4CMSCaloPlugins.obj
>> Building  edm plugin tmp/slc7_amd64_gcc10/src/SimG4CMS/Calo/plugins/SimG4CMSCaloPlugins/libSimG4CMSCaloPlugins.so
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc10/external/gcc/10.3.0-84898dea653199466402e67d73657f10/bin/../lib/gcc/x86_64-unknown-linux-gnu/10.3.0/../../../../x86_64-unknown-linux-gnu/bin/ld: tmp/slc7_amd64_gcc10/src/SimG4CMS/Calo/plugins/SimG4CMSCaloPlugins/CaloSteppingAction.cc.o: in function `CaloSteppingAction::update(BeginOfRun const*)':
CaloSteppingAction.cc:(.text+0x2931): undefined reference to `G4Trap::GetZHalfLength() const'
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc10/external/gcc/10.3.0-84898dea653199466402e67d73657f10/bin/../lib/gcc/x86_64-unknown-linux-gnu/10.3.0/../../../../x86_64-unknown-linux-gnu/bin/ld: CaloSteppingAction.cc:(.text+0x2a89): undefined reference to `G4Trap::GetZHalfLength() const'
collect2: error: ld returned 1 exit status
gmake: *** [tmp/slc7_amd64_gcc10/src/SimG4CMS/Calo/plugins/SimG4CMSCaloPlugins/libSimG4CMSCaloPlugins.so] Error 1
Leaving library rule at src/SimG4CMS/Calo/plugins
>> Leaving Package SimG4CMS/Calo
>> Package SimG4CMS/Calo built
>> Entering Package SimGeneral/CaloAnalysis

@civanch
Copy link
Contributor Author

civanch commented Apr 26, 2022 •
edited
Loading

@smuzaffar , I see that SimG4CMS/Calo/plugins/BuildFile.xml does not have explicit
geant4core. It may get it indirectly.... but build fails in this plugin. Should it be added?

@smuzaffar
Copy link
Contributor

@civanch , I see that https://github.com/cms-sw/cmssw/blob/master/SimG4CMS/Calo/plugins/CaloSteppingAction.cc#L266-L267 we try to access G4Trap::GetZHalfLength() but in libG4geometry.so there is no G4Trap but there is G4UTrap::GetZHalfLength() const. This is the reason we have these link issues.

@cmsbuild
Copy link
Contributor

Pull request #7821 was updated.

@civanch
Copy link
Contributor Author

civanch commented Apr 27, 2022

@smuzaffar , I step back from geant4.spec change.

@smuzaffar
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-baf219/24277/summary.html
COMMIT: e601a16
CMSSW: CMSSW_12_4_G4VECGEOM_X_2022-04-25-2300/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/7821/24277/install.sh to create a dev area with all the needed externals and cmssw changes.

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-baf219/24277/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-baf219/24277/git-merge-result

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 70942 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3695434
  • DQMHistoTests: Total failures: 480697
  • DQMHistoTests: Total nulls: 375
  • DQMHistoTests: Total successes: 3214340
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 1.285 KiB( 48 files compared)
  • DQMHistoSizes: changed ( 1000.0 ): -0.059 KiB MessageLogger/Errors
  • DQMHistoSizes: changed ( 1000.0 ): -0.059 KiB MessageLogger/Warnings
  • DQMHistoSizes: changed ( 10224.0 ): -0.117 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 11834.0 ): 1.312 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 250202.181 ): 0.006 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 25202.0 ): -0.246 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 312.0 ): 0.004 KiB MessageLogger/Warnings
  • DQMHistoSizes: changed ( 7.3 ): 1.936 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 8.0 ): -1.493 KiB SiStrip/MechanicalView
  • Checked 205 log files, 45 edm output root files, 49 DQM output files
  • TriggerResults: found differences in 15 / 48 workflows

@smuzaffar
Copy link
Contributor

+externals
this is for special G4VECGEOM IBs

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next IB/CMSSW_12_4_X/geant4_vecgeom IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@smuzaffar smuzaffar merged commit e65e6f1 into cms-sw:IB/CMSSW_12_4_X/geant4_vecgeom Apr 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
externals-approved fully-signed orp-pending tests-approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@civanch @cmsbuild @smuzaffar