[DD4hep] Update to master 21 10 2020 #31879

ianna · 2020-10-21T07:23:54Z

PR description:

Merge all PRs in one: [DD4hep] Final Changes to Replace tbb with std - requires a DD4hep update #31770, [DD4hep][Simulation] Use regex Comparison if Selection is a Regular Expression #31810, [DD4hep] Update to DD4hep master of 16.10.2020 #31821
Allow to select correct sensitive detectors when their SpecPars defined as regular expressions
Replace tbb with std containers

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

Before submitting your pull requests, make sure you followed this checklist:

verify that the PR is really intended for the chosen branch
verify that changes follow CMS Naming, Coding, And Style Rules
verify that the PR passes the basic test procedure suggested in the CMSSW PR instructions

cmsbuild · 2020-10-21T07:24:14Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-10-21T07:24:39Z

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

CMSSW_11_2_X_2020-10-20-2300/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/10167/console Started: 2020/10/21 09:26

smuzaffar · 2020-10-22T08:45:13Z

@silviodonato , all is good , feel free to merge this and cmsdist pr

silviodonato · 2020-10-22T08:46:02Z

merge

ianna · 2020-10-22T08:46:47Z

+1

resigned for the record

cmsbuild · 2020-10-22T08:47:08Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-10-21-2300/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/10194/console Started: 2020/10/22 10:49

civanch · 2020-10-22T08:51:58Z

+1

cmsbuild · 2020-10-22T08:58:21Z

-1

Tested at: 6841d20

CMSSW: CMSSW_11_2_X_2020-10-21-2300
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-1db636/10194/summary.html

I found follow errors while testing this PR

Failed tests: Build HeaderConsistency 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 /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc
In file included from /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc:6:
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h: In function 'std::vector cms::getAllParameterValuesFromSpecParSections(const DDSpecParRegistry&, const string&, const string&)':
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h:61:28: error: request for member 'second' in 'mySpecParSection', which is of pointer type 'const dd4hep::SpecPar* const' (maybe you meant to use '->' ?)
       if (mySpecParSection.second->hasPath(nodePath)) {
                            ^~~~~~
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h:62:33: error: request for member 'second' in 'mySpecParSection', which is of pointer type 'const dd4hep::SpecPar* const' (maybe you meant to use '->' ?)
         return mySpecParSection.second->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 64 COMPILER='llvm compile'

>> Entering Package Alignment/CocoaApplication
>> Compiling  /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/bin/cocoa.cpp
Entering library rule at Alignment/CocoaApplication
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc
In file included from /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc:6:
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h:61:27: error: member reference type 'const dd4hep::SpecPar *const' is a pointer; did you mean to use '->'?
      if (mySpecParSection.second->hasPath(nodePath)) {
          ~~~~~~~~~~~~~~~~^
                          ->
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h:61:28: error: no member named 'second' in 'dd4hep::SpecPar'
      if (mySpecParSection.second->hasPath(nodePath)) {

cmsbuild · 2020-10-22T08:58:23Z

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

ianna · 2020-10-22T09:01:13Z

-1

Tested at: 6841d20

CMSSW: CMSSW_11_2_X_2020-10-21-2300
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-1db636/10194/summary.html

I found follow errors while testing this PR

Failed tests: Build HeaderConsistency 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 /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc
In file included from /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc:6:
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h: In function 'std::vector cms::getAllParameterValuesFromSpecParSections(const DDSpecParRegistry&, const string&, const string&)':
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h:61:28: error: request for member 'second' in 'mySpecParSection', which is of pointer type 'const dd4hep::SpecPar* const' (maybe you meant to use '->' ?)
if (mySpecParSection.second->hasPath(nodePath)) {
^~~~~~
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h:62:33: error: request for member 'second' in 'mySpecParSection', which is of pointer type 'const dd4hep::SpecPar* const' (maybe you meant to use '->' ?)
return mySpecParSection.second->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 64 COMPILER='llvm compile'
Entering Package Alignment/CocoaApplication
>> Compiling /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/bin/cocoa.cpp
Entering library rule at Alignment/CocoaApplication
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc
In file included from /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/Alignment/CocoaApplication/src/CocoaAnalyzer.cc:6:
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h:61:27: error: member reference type 'const dd4hep::SpecPar *const' is a pointer; did you mean to use '->'?
if (mySpecParSection.second->hasPath(nodePath)) {
~~~~~~~~~~~~~~~~^
->
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-21-2300/src/DetectorDescription/DDCMS/interface/DDCompactView.h:61:28: error: no member named 'second' in 'dd4hep::SpecPar'
if (mySpecParSection.second->hasPath(nodePath)) {

@smuzaffar - this is due to changes in external API. Somehow the new external is not picked up.

SimG4Core/Geometry/src/DDG4ProductionCuts.cc

kpedro88 · 2020-10-22T15:05:10Z

to be clear, I find the expectation that I should review a PR between 1am-4am to be ridiculous.

kpedro88 · 2020-10-22T15:05:59Z

+upgrade
minor API changes in MTD geometry packages

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml

ianna · 2020-10-23T06:12:26Z

to be clear, I find the expectation that I should review a PR between 1am-4am to be ridiculous.

apologies, it will not happen again :-)

Ianna Osborne and others added 14 commits October 20, 2020 09:38

replace tbb containers with std ones

c09d6ee

final changes to replace tbb with std - requires updated dd4hep

966e129

update to a new API

66f87c6

update to the new dd4hep version

755406f

use regex comparison if selection is a regex

1290152

remove unused variable

d4a5a55

update to new vesrion of dd4hep

6d1e1d0

reverse comparison

02c84a8

replace tbb containers with std ones

724d941

no need for atomic

fe0ac3f

final changes and cleanup

6cd3fe5

clang tidy

58a5d0d

one more fix and code format

784badb

clean up filter test and merge specifics

0573325

cmsbuild added this to the CMSSW_11_2_X milestone Oct 21, 2020

cmsbuild added alca-pending code-checks-pending comparison-pending geometry-pending orp-pending pending-signatures simulation-pending tests-pending upgrade-pending labels Oct 21, 2020

ianna mentioned this pull request Oct 21, 2020

Update DD4Hep to latest commit on master cms-sw/cmsdist#6315

Merged

cmsbuild added requires-external tests-started and removed tests-pending labels Oct 21, 2020

cmsbuild added orp-approved and removed orp-pending labels Oct 22, 2020

cmsbuild merged commit 8c3c47e into cms-sw:master Oct 22, 2020

cmsbuild added geometry-approved tests-started and removed geometry-pending tests-pending labels Oct 22, 2020

cmsbuild added simulation-approved and removed simulation-pending labels Oct 22, 2020

cmsbuild added comparison-notrun tests-rejected and removed comparison-pending tests-started labels Oct 22, 2020

ghugo83 reviewed Oct 22, 2020

View reviewed changes

SimG4Core/Geometry/src/DDG4ProductionCuts.cc Show resolved Hide resolved

cmsbuild added upgrade-approved and removed upgrade-pending labels Oct 22, 2020

cvuosalo reviewed Oct 22, 2020

View reviewed changes

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml Show resolved Hide resolved

ianna mentioned this pull request Oct 23, 2020

[DD4hep] Close Geometry and Use Regex for Production Cuts Selection #31915

Merged

fabiocos mentioned this pull request Oct 23, 2020

MTD geometry: DD4hep specPar update, additional fix #31921

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DD4hep] Update to master 21 10 2020 #31879

[DD4hep] Update to master 21 10 2020 #31879

ianna commented Oct 21, 2020 •

edited

Loading

cmsbuild commented Oct 21, 2020

cmsbuild commented Oct 21, 2020 •

edited

Loading

smuzaffar commented Oct 22, 2020

silviodonato commented Oct 22, 2020

ianna commented Oct 22, 2020

cmsbuild commented Oct 22, 2020 •

edited

Loading

civanch commented Oct 22, 2020

cmsbuild commented Oct 22, 2020

cmsbuild commented Oct 22, 2020

ianna commented Oct 22, 2020

kpedro88 commented Oct 22, 2020

kpedro88 commented Oct 22, 2020

ianna commented Oct 23, 2020

[DD4hep] Update to master 21 10 2020 #31879

[DD4hep] Update to master 21 10 2020 #31879

Conversation

ianna commented Oct 21, 2020 • edited Loading

PR description:

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

cmsbuild commented Oct 21, 2020

cmsbuild commented Oct 21, 2020 • edited Loading

smuzaffar commented Oct 22, 2020

silviodonato commented Oct 22, 2020

ianna commented Oct 22, 2020

cmsbuild commented Oct 22, 2020 • edited Loading

civanch commented Oct 22, 2020

cmsbuild commented Oct 22, 2020

cmsbuild commented Oct 22, 2020

ianna commented Oct 22, 2020

kpedro88 commented Oct 22, 2020

kpedro88 commented Oct 22, 2020

ianna commented Oct 23, 2020

ianna commented Oct 21, 2020 •

edited

Loading

cmsbuild commented Oct 21, 2020 •

edited

Loading

cmsbuild commented Oct 22, 2020 •

edited

Loading