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

DD Core Cleanup #24153

Merged
merged 4 commits into from
Aug 3, 2018
Merged

DD Core Cleanup #24153

merged 4 commits into from
Aug 3, 2018

Conversation

ianna
Copy link
Contributor

@ianna ianna commented Aug 1, 2018

  • Move access to Singleton instances to a base class
  • Remove unsafe member functions from a base class
  • Use C++11 type aliases
  • Use CMS coding style
  • Remove commented out code
  • Move tests and their helper functions from a Core to a Regression test package

@ianna
Copy link
Contributor Author

ianna commented Aug 1, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/29600/console Started: 2018/08/01 12:46

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

A new Pull Request was created by @ianna (Ianna Osborne) for master.

It involves the following packages:

DetectorDescription/Core
DetectorDescription/Parser
DetectorDescription/RegressionTest

@cmsbuild, @civanch, @Dr15Jones, @ianna, @mdhildreth can you please review it and eventually sign? Thanks.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

-1

Tested at: b60e21b

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

I found follow errors while testing this PR

Failed tests: Build

  • Build:

I found an error when building:

>> Package Geometry/DTGeometryBuilder built
>> Entering Package DetectorDescription/RegressionTest
Entering library rule at src/DetectorDescription/RegressionTest/plugins
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_3_X_2018-07-31-2300/src/DetectorDescription/RegressionTest/plugins/CompareDDCompactViews.cc 
In file included from /build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_3_X_2018-07-31-2300/src/DetectorDescription/RegressionTest/plugins/CompareDDCompactViews.cc:8:0:
/build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_3_X_2018-07-31-2300/poison/DetectorDescription/Core/src/DDCheck.h:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
 #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
  ^~~~~
/build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_3_X_2018-07-31-2300/src/DetectorDescription/RegressionTest/plugins/CompareDDCompactViews.cc: In member function 'virtual void CompareDDCompactViews::beginRun(const edm::Run&, const edm::EventSetup&)':
/build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_3_X_2018-07-31-2300/src/DetectorDescription/RegressionTest/plugins/CompareDDCompactViews.cc:42:3: error: 'DDCheckMaterials' was not declared in this scope
   DDCheckMaterials( std::cout );


@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

Pull request #24153 was updated. @cmsbuild, @civanch, @Dr15Jones, @ianna, @mdhildreth can you please check and sign again.

@ianna
Copy link
Contributor Author

ianna commented Aug 1, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/29606/console Started: 2018/08/01 16:44

return prep_ ? bool( prep_->second )
: false;
}
void create( const N& name, C vals ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we consider eventually changing the create method to be taking a std::unique_ptr<C> since it appears to take ownership of the value?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed, my thoughts exactly :-)

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 31
  • DQMHistoTests: Total histograms compared: 2891565
  • DQMHistoTests: Total failures: 2
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2891373
  • DQMHistoTests: Total skipped: 190
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 30 files compared)
  • Checked 128 log files, 14 edm output root files, 31 DQM output files

@ianna
Copy link
Contributor Author

ianna commented Aug 1, 2018

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2018

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

@fabiocos
Copy link
Contributor

fabiocos commented Aug 3, 2018

+1

@cmsbuild cmsbuild merged commit 027d29c into cms-sw:master Aug 3, 2018
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

4 participants