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

[10_6_X] upgrade sherpa 2.2.10 to 2.2.11 #6662

Merged
merged 2 commits into from Feb 26, 2021

Conversation

SiewYan
Copy link
Contributor

@SiewYan SiewYan commented Feb 19, 2021

First attempt to upgrade sherpa to 2.2.11, expecting better prediction for v+jets samples compares to previous release. If this PR is successful, will followup with backports.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @SiewYan (Siewyan Hoh 何守仁) for branch IB/CMSSW_10_6_X/gcc700.

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

@mrodozov
Copy link
Contributor

please test

@mrodozov
Copy link
Contributor

allow @SiewYan test rights

@cmsbuild
Copy link
Contributor

-1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-50144e/12990/summary.html
COMMIT: 04f8013
CMSSW: CMSSW_10_6_X_2021-02-19-1100/slc7_amd64_gcc700
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmsdist/6662/12990/install.sh to create a dev area with all the needed externals and cmssw changes.

External Build

I found compilation error when building:

*** Warning: Linking the shared library libSherpaMCFM.la against the
*** static library /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc700/external/mcfm/6.3-pafccj9/lib/libMCFM.a is not portable!
libtool: link: mpicxx -Wl,--no-as-needed  -fPIC -DPIC -shared -nostdlib /lib/../lib64/crti.o /cvmfs/cms-ib.cern.ch/nweek-02668/slc7_amd64_gcc700/external/gcc/7.0.0-pafccj/bin/../lib/gcc/x86_64-unknown-linux-gnu/7.4.1/crtbeginS.o  .libs/libSherpaMCFM_la-MCFM_gg_hgg.o .libs/libSherpaMCFM_la-MCFM_Interface.o   -ldl -L/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc700/external/blackhat/0.9.9-pafccj/lib/blackhat -L/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc700/external/qd/2.3.13-pafccj/lib -L/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc700/external/openssl/1.0.2d-pafccj/lib /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc700/external/mcfm/6.3-pafccj9/lib/libMCFM.a -L/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc700/external/openmpi/2.1.5-pafccj/lib -L/cvmfs/cms-ib.cern.ch/nweek-02668/slc7_amd64_gcc700/external/gcc/7.0.0-pafccj/bin/../lib/gcc/x86_64-unknown-linux-gnu/7.4.1 -L/cvmfs/cms-ib.cern.ch/nweek-02668/slc7_amd64_gcc700/external/gcc/7.0.0-pafccj/bin/../lib/gcc -L/cvmfs/cms-ib.cern.ch/nweek-02668/slc7_amd64_gcc700/external/gcc/7.0.0-pafccj/bin/../lib/gcc/x86_64-unknown-linux-gnu/7.4.1/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/cvmfs/cms-ib.cern.ch/nweek-02668/slc7_amd64_gcc700/external/gcc/7.0.0-pafccj/bin/../lib/gcc/x86_64-unknown-linux-gnu/7.4.1/../../../../x86_64-unknown-linux-gnu/lib -L/cvmfs/cms-ib.cern.ch/nweek-02668/slc7_amd64_gcc700/external/gcc/7.0.0-pafccj/bin/../lib/gcc/x86_64-unknown-linux-gnu/7.4.1/../../.. -lmpi_cxx -lmpi -lstdc++ -lm -lpthread -lc -lgcc_s /cvmfs/cms-ib.cern.ch/nweek-02668/slc7_amd64_gcc700/external/gcc/7.0.0-pafccj/bin/../lib/gcc/x86_64-unknown-linux-gnu/7.4.1/crtendS.o /lib/../lib64/crtn.o  -Wl,--no-as-needed -g -O2 -O2   -Wl,-soname -Wl,libSherpaMCFM.so.0 -o .libs/libSherpaMCFM.so.0.0.0
/cvmfs/cms-ib.cern.ch/nweek-02668/slc7_amd64_gcc700/external/gcc/7.0.0-pafccj/bin/../lib/gcc/x86_64-unknown-linux-gnu/7.4.1/../../../../x86_64-unknown-linux-gnu/bin/ld: nflav_: TLS reference in .libs/libSherpaMCFM_la-MCFM_Interface.o mismatches non-TLS reference in /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc700/external/mcfm/6.3-pafccj9/lib/libMCFM.a(A1Hggggpmmm.o)
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/slc7_amd64_gcc700/external/mcfm/6.3-pafccj9/lib/libMCFM.a: error adding symbols: Bad value
collect2: error: ld returned 1 exit status
make[3]: *** [libSherpaMCFM.la] Error 1
make[3]: Leaving directory `/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/BUILD/slc7_amd64_gcc700/external/sherpa/2.2.11-5e0dd0d825a51d9994075227dc666304/SHERPA-MC-2.2.11/AddOns/MCFM'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/BUILD/slc7_amd64_gcc700/external/sherpa/2.2.11-5e0dd0d825a51d9994075227dc666304/SHERPA-MC-2.2.11/AddOns'
make[1]: *** [all-recursive] Error 1


@SiewYan
Copy link
Contributor Author

SiewYan commented Feb 19, 2021

Looks like the shared libraries could not link to the static libraries... there are changes on the MCFM linkage in the latest sherpa version [1].

[1] https://gitlab.com/sherpa-team/sherpa/-/merge_requests/389/diffs

@GurpreetSinghChahal
Copy link

@SiewYan Thank you! This issue has been discussed with Sherpa authors and the suggestion is compile/integrate this release without MCFM. There are a few issues under investigation for MCFM that could be solved in a few weeks time scale. We can use OpenLopps/blackhat for some processes instead of MCFM.

@SiewYan
Copy link
Contributor Author

SiewYan commented Feb 23, 2021

@GurpreetSinghChahal , i will disable mcfm for this sherpa version. Thanks for the clarification!

disable mcfm
@cmsbuild
Copy link
Contributor

Pull request #6662 was updated.

@SiewYan
Copy link
Contributor Author

SiewYan commented Feb 23, 2021

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-50144e/13048/summary.html
COMMIT: 7f97f5d
CMSSW: CMSSW_10_6_X_2021-02-23-1100/slc7_amd64_gcc700
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmsdist/6662/13048/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 35
  • DQMHistoTests: Total histograms compared: 3215540
  • DQMHistoTests: Total failures: 2
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3215204
  • DQMHistoTests: Total skipped: 334
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
  • Checked 143 log files, 29 edm output root files, 35 DQM output files

@smuzaffar
Copy link
Contributor

this should first go in IB/CMSSW_11_3_X/master branch, @SiewYan can you please open a PR for IB/CMSSW_11_3_X/master too

@SiewYan
Copy link
Contributor Author

SiewYan commented Feb 23, 2021

@smuzaffar certainly! #6672

@SiewYan SiewYan changed the title upgrade sherpa 2.2.10 to 2.2.11 [10_6_X] upgrade sherpa 2.2.10 to 2.2.11 Feb 23, 2021
@smuzaffar
Copy link
Contributor

+externals

@cmsbuild
Copy link
Contributor

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

@SiewYan
Copy link
Contributor Author

SiewYan commented Feb 25, 2021

assign generators

@cmsbuild
Copy link
Contributor

New categories assigned: generators

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

@SiewYan
Copy link
Contributor Author

SiewYan commented Feb 25, 2021

+1

@cmsbuild
Copy link
Contributor

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

@qliphy
Copy link
Contributor

qliphy commented Feb 26, 2021

+1

@cmsbuild cmsbuild merged commit 331c42a into cms-sw:IB/CMSSW_10_6_X/gcc700 Feb 26, 2021
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

6 participants