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

Update DD4Hep to latest commit on master #6315

Merged
merged 1 commit into from
Oct 22, 2020

Conversation

mrodozov
Copy link
Contributor

please test with cms-sw/cmssw#31770

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 15, 2020

The tests are being triggered in jenkins.
Tested with other pull request(s) cms-sw/cmssw#31770

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @mrodozov (Mircho Rodozov) for branch IB/CMSSW_11_2_X/master.

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

@mrodozov
Copy link
Contributor Author

Resolves: #6308

@cmsbuild
Copy link
Contributor

-1

Tested at: 2e8e941

CMSSW: CMSSW_11_2_X_2020-10-15-1100
SCRAM_ARCH: slc7_amd64_gcc820
You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-44bdfb/9987/summary.html

I found follow errors while testing this PR

Failed tests: Build ClangBuild

  • Build:

I found compilation error when building:

Copying tmp/slc7_amd64_gcc820/src/Alignment/CocoaApplication/bin/cocoa/cocoa to productstore area:
Entering library rule at Alignment/CocoaApplication
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/SealModule.cc
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc: In member function 'std::vector CocoaAnalyzer::getAllParameterValuesFromSpecParSections(const DDSpecParRegistry&, const string&, const string&)':
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc:584:25: error: base operand of '->' has non-pointer type 'const std::pair, const dd4hep::SpecPar*>'
     if (mySpecParSection->hasPath(nodePath)) {
                         ^~
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc:585:30: error: base operand of '->' has non-pointer type 'const std::pair, const dd4hep::SpecPar*>'
       return mySpecParSection->value>(parameterName);
                              ^~

  • Clang:

I found compilation error while trying to compile with clang. Command used:

USER_CUDA_FLAGS='--expt-relaxed-constexpr' USER_CXXFLAGS='-Wno-register -fsyntax-only' scram build -k -j 32 COMPILER='llvm compile'

>> Entering Package Alignment/CocoaApplication
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/bin/cocoa.cpp
Entering library rule at Alignment/CocoaApplication
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/SealModule.cc
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc:584:25: error: member reference type 'const std::pair, std::allocator >, const dd4hep::SpecPar *>' is not a pointer; did you mean to use '.'?
    if (mySpecParSection->hasPath(nodePath)) {
        ~~~~~~~~~~~~~~~~^~
                        .
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-15-1100/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc:584:27: error: no member named 'hasPath' in 'std::pair, std::allocator >, const dd4hep::SpecPar *>'
    if (mySpecParSection->hasPath(nodePath)) {


@cmsbuild
Copy link
Contributor

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

@ianna
Copy link

ianna commented Oct 16, 2020

@mrodozov - the fix for these errors is to use:

if (mySpecParSection.second->hasPath(nodePath)) {
return mySpecParSection.second->value>(parameterName);

Could you, please, apply the changes? Alternatively, I can provide a PR for that. Please, let me know. Thanks.

@ianna
Copy link

ianna commented Oct 16, 2020

@mrodozov - I have a patch for it:
cmsdev20:/build/yana/CMSSW_11_2_X_2020-10-15-1100/src/alignmemt.patch.diff

Piggybacked on it and cleaned up the header and SealModule.

@ianna
Copy link

ianna commented Oct 16, 2020

@mrodozov - I have a patch for it:
cmsdev20:/build/yana/CMSSW_11_2_X_2020-10-15-1100/src/alignmemt.patch.diff

Piggybacked on it and cleaned up the header and SealModule.

Ok, there are more files need similar changes. I'll make a PR soon.

@ianna
Copy link

ianna commented Oct 16, 2020

Fixed in cms-sw/cmssw#31821

@ianna
Copy link

ianna commented Oct 16, 2020

please test with cms-sw/cmssw#31821

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 21, 2020

The tests are being triggered in jenkins.
Tested with other pull request(s) cms-sw/cmssw#31879

@cmsbuild
Copy link
Contributor

+1
Tested at: 2e8e941
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-852def/10192/summary.html
CMSSW: CMSSW_11_2_X_2020-10-21-1100
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

Comparison job queued.

@ianna
Copy link

ianna commented Oct 22, 2020

@smuzaffar - please, consider this update for 11:00 am IB. There are several people who need this for their development. Thanks!

@smuzaffar
Copy link
Contributor

@ianna , same question, is it safe to merge it without cmssw changes? If not then I am afraid I can not merge it and break IB for all.

@ianna
Copy link

ianna commented Oct 22, 2020

@ianna , same question, is it safe to merge it without cmssw changes? If not then I am afraid I can not merge it and break IB for all.

@smuzaffar - no, it has to go along with cms-sw/cmssw#31879, however, the code checks block its proper integration.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-852def/10192/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 35
  • DQMHistoTests: Total histograms compared: 2544110
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2544081
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
  • Checked 149 log files, 22 edm output root files, 35 DQM output files

@smuzaffar
Copy link
Contributor

@ianna , I have approved the code checks ( after testing it locally using new dd4hep)

@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_11_2_X/master 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)

@silviodonato
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 30fe6c8 into IB/CMSSW_11_2_X/master Oct 22, 2020
@mrodozov mrodozov deleted the dd4hep-update branch October 22, 2020 09:36
@ianna ianna mentioned this pull request Oct 24, 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.

6 participants