[Cond] Move public headers to interface directory #34742

smuzaffar · 2021-08-03T12:54:08Z

As reported in #34718 , this PR moves headers in interface directory for Cond*

      2 src/CondCore/CondDB/src/DbCore.h
      1 src/CondCore/CondDB/src/IOVSchema.cc
      2 src/CondFormats/EcalObjects/src/classes.h

cmsbuild · 2021-08-03T13:04:22Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34742/24397

This PR adds an extra 32KB to repository

smuzaffar · 2021-08-03T13:04:46Z

please test

cmsbuild · 2021-08-03T13:04:47Z

A new Pull Request was created by @smuzaffar (Malik Shahzad Muzaffar) for master.

It involves the following packages:

CondCore/CondDB (db)
CondCore/Utilities (db)
SimCalorimetry/EcalSimProducers (simulation)

@ggovi, @cmsbuild, @civanch, @mdhildreth can you please review it and eventually sign? Thanks.
@rchatter, @rovere, @argiro, @thomreis, @simonepigazzini, @mmusich this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy, @perrotta you are the release manager for this.

cms-bot commands are listed here

cmsbuild · 2021-08-03T13:16:36Z

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fcb47b/17465/summary.html
COMMIT: cf72523
CMSSW: CMSSW_12_1_X_2021-08-02-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/34742/17465/install.sh to create a dev area with all the needed externals and cmssw changes.

Build

I found compilation error when building:

>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-08-02-2300/src/CondCore/Utilities/src/CondDBImport.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-08-02-2300/src/CondCore/Utilities/src/CondDBTools.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-08-02-2300/src/CondCore/Utilities/src/PayloadInspector.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-08-02-2300/src/CondCore/Utilities/src/Utilities.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-08-02-2300/src/CondCore/Utilities/src/CondDBTools.cc:5:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-08-02-2300/poison/CondCore/CondDB/src/DbCore.h:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
    1 | #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
      |  ^~~~~
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-08-02-2300/src/CondCore/Utilities/src/CondDBTools.cc:5:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-08-02-2300/poison/CondCore/CondDB/src/DbCore.h:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
    1 | #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.

cmsbuild · 2021-08-03T15:29:14Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34742/24409

This PR adds an extra 36KB to repository

cmsbuild · 2021-08-03T15:29:37Z

Pull request #34742 was updated. @ggovi, @cmsbuild, @civanch, @mdhildreth can you please check and sign again.

CondCore/CondDB/src/ConnectionPool.cc

cmsbuild · 2021-08-06T08:10:05Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34742/24542

This PR adds an extra 44KB to repository

cmsbuild · 2021-08-06T08:10:31Z

Pull request #34742 was updated. @ggovi, @cmsbuild, @civanch, @mdhildreth can you please check and sign again.

perrotta · 2021-08-06T08:15:03Z

please test

cmsbuild · 2021-08-06T18:40:21Z

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fcb47b/17604/summary.html
COMMIT: 6e04c5b
CMSSW: CMSSW_12_1_X_2021-08-05-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/34742/17604/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

11601.011601.0_SingleElectronPt10+2021+SingleElectronPt10_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleElectronPt10+2021+SingleElectronPt10_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
11602.011602.0_SingleElectronPt35+2021+SingleElectronPt35_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleElectronPt35+2021+SingleElectronPt35_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
11603.011603.0_SingleElectronPt1000+2021+SingleElectronPt1000_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleElectronPt1000+2021+SingleElectronPt1000_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log

Expand to see more relval errors ...

Comparison Summary

Summary:

No significant changes to the logs found
Reco comparison results: 2 differences found in the comparisons
DQMHistoTests: Total files compared: 39
DQMHistoTests: Total histograms compared: 2999410
DQMHistoTests: Total failures: 7
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2999381
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 38 files compared)
Checked 165 log files, 37 edm output root files, 39 DQM output files
TriggerResults: no differences found

civanch · 2021-08-08T09:24:53Z

+1

perrotta · 2021-08-09T13:20:38Z

CondCore/CondDB/interface/IOVSchema.h

@@ -10,6 +10,8 @@ namespace cond {

  namespace persistency {

+    cond::Hash makeHash(const std::string& objectType, const cond::Binary& data);


@smuzaffar out of curiosity: what is the purpose of this new method defined here?

cmssw/CondCore/Utilities/bin/conddb_test_gt_perf.cpp

Line 5 in 79d9ef3

#include "CondCore/CondDB/src/IOVSchema.cc"

was including CondCore/CondDB/src/IOVSchema.cc to call makeHash (

cmssw/CondCore/Utilities/bin/conddb_test_gt_perf.cpp

Line 193 in 79d9ef3

cond::Hash localHash = cond::persistency::makeHash(payloadType, m_buffer);

). I moved the declaration in the header so that CondCore/Utilities/bin/conddb_test_gt_perf.cpp can include CondCore/CondDB/interface/IOVSchema.h

smuzaffar · 2021-08-09T21:35:33Z

please test

cmsbuild · 2021-08-10T03:13:55Z

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fcb47b/17655/summary.html
COMMIT: 6e04c5b
CMSSW: CMSSW_12_1_X_2021-08-09-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34742/17655/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

11630.011630.0_QCD_Pt_3000_3500_14TeV+2021+QCD_Pt_3000_3500_14TeV_TuneCUETP8M1_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_QCD_Pt_3000_3500_14TeV+2021+QCD_Pt_3000_3500_14TeV_TuneCUETP8M1_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
11634.2411634.24_TTbar_14TeV+2021_0T+TTbar_14TeV_TuneCP5_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_TTbar_14TeV+2021_0T+TTbar_14TeV_TuneCP5_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
11634.50511634.505_TTbar_14TeV+2021_Patatrack_PixelOnlyTripletsCPU+TTbar_14TeV_TuneCP5_GenSimINPUT+Digi+Reco+HARVEST/step2_TTbar_14TeV+2021_Patatrack_PixelOnlyTripletsCPU+TTbar_14TeV_TuneCP5_GenSimINPUT+Digi+Reco+HARVEST.log

Expand to see more relval errors ...

Comparison Summary

Summary:

No significant changes to the logs found
Reco comparison results: 0 differences found in the comparisons
DQMHistoTests: Total files compared: 39
DQMHistoTests: Total histograms compared: 2999410
DQMHistoTests: Total failures: 1
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2999387
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 38 files compared)
Checked 165 log files, 37 edm output root files, 39 DQM output files
TriggerResults: no differences found

ggovi · 2021-08-11T19:52:00Z

@smuzaffar I propose a 'cheaper' set of changes for the CondCore/CondDB part:
#34847
Please provide feedback...

smuzaffar · 2021-08-11T20:15:26Z

thanks @ggovi, once #34847 is merged then I can rebase this PR

smuzaffar · 2021-08-12T08:10:37Z

Closing this PR as #34847 takes care of the CondCore/CondDB private header and I will opena new one for SimCalorimetry/EcalSimProducers

[Cond] Move public headers on to interface directory

bc98d0c

cmsbuild added this to the CMSSW_12_1_X milestone Aug 3, 2021

cmsbuild added code-checks-pending db-pending orp-pending pending-signatures simulation-pending tests-pending labels Aug 3, 2021

remove unused include

cf72523

cmsbuild added code-checks-approved and removed code-checks-pending labels Aug 3, 2021

cmsbuild added tests-started and removed tests-pending labels Aug 3, 2021

cmsbuild added tests-rejected and removed tests-started labels Aug 3, 2021

use interface/DbCore.h

6e1b541

cmsbuild added code-checks-pending tests-pending and removed code-checks-approved tests-rejected labels Aug 3, 2021

cmsbuild added code-checks-approved and removed code-checks-pending labels Aug 3, 2021

smuzaffar changed the title ~~[Cond] Move public headers on to interface directory~~ [Cond] Move public headers to interface directory Aug 4, 2021

perrotta reviewed Aug 6, 2021

View reviewed changes

CondCore/CondDB/src/ConnectionPool.cc Outdated Show resolved Hide resolved

cmsbuild added code-checks-approved and removed code-checks-pending labels Aug 6, 2021

cmsbuild added tests-started and removed tests-pending labels Aug 6, 2021

cmsbuild added tests-rejected and removed tests-started labels Aug 6, 2021

cmsbuild added simulation-approved and removed simulation-pending labels Aug 8, 2021

perrotta reviewed Aug 9, 2021

View reviewed changes

cmsbuild added tests-started and removed tests-rejected labels Aug 9, 2021

cmsbuild added tests-rejected tests-started and removed tests-started tests-rejected labels Aug 10, 2021

cmsbuild mentioned this pull request Aug 11, 2021

CondCore/Utilities: cleaned up dependencies from CondCore/CondDB details #34847

Merged

smuzaffar closed this Aug 12, 2021

smuzaffar deleted the cond-header-fix branch August 12, 2021 08:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Cond] Move public headers to interface directory #34742

[Cond] Move public headers to interface directory #34742

smuzaffar commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

smuzaffar commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

cmsbuild commented Aug 6, 2021

cmsbuild commented Aug 6, 2021

perrotta commented Aug 6, 2021

cmsbuild commented Aug 6, 2021

civanch commented Aug 8, 2021

perrotta Aug 9, 2021

smuzaffar Aug 9, 2021

smuzaffar commented Aug 9, 2021

cmsbuild commented Aug 10, 2021

ggovi commented Aug 11, 2021

smuzaffar commented Aug 11, 2021

smuzaffar commented Aug 12, 2021

		@@ -10,6 +10,8 @@ namespace cond {

		namespace persistency {

		cond::Hash makeHash(const std::string& objectType, const cond::Binary& data);

[Cond] Move public headers to interface directory #34742

[Cond] Move public headers to interface directory #34742

Conversation

smuzaffar commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

smuzaffar commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

Build

cmsbuild commented Aug 3, 2021

cmsbuild commented Aug 3, 2021

cmsbuild commented Aug 6, 2021

cmsbuild commented Aug 6, 2021

perrotta commented Aug 6, 2021

cmsbuild commented Aug 6, 2021

RelVals-INPUT

Comparison Summary

civanch commented Aug 8, 2021

perrotta Aug 9, 2021

Choose a reason for hiding this comment

smuzaffar Aug 9, 2021

Choose a reason for hiding this comment

smuzaffar commented Aug 9, 2021

cmsbuild commented Aug 10, 2021

RelVals-INPUT

Comparison Summary

ggovi commented Aug 11, 2021

smuzaffar commented Aug 11, 2021

smuzaffar commented Aug 12, 2021