cmssw icon indicating copy to clipboard operation
cmssw copied to clipboard

Published 20 hours ago • verified publisher icon cms-sw

Rename inline c++ files to .icc

Open fwyzard opened this issue 2 years ago • 17 comments

PR description:

Rename inline c++ files with different extensions (*.impl, *.inl) to .icc that is the most common one used in CMSSW:

$ find * -name '*.icc' -or -name '*.impl' -or -name '*.inl' | cut -d. -f2 | sort | uniq -c
     86 icc
      1 impl
      4 inl

Move include files used by a single .cc file to the src/ directory.

No changes expected.

fwyzard avatar Jul 30 '22 06:07 fwyzard

please test

fwyzard avatar Jul 30 '22 06:07 fwyzard

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38904/31338

  • This PR adds an extra 28KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

  • code-checks: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38904/31338/code-checks.patch e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38904/31338/code-checks.patch | patch -p1 You can also run scram build code-checks to apply code checks directly

  • code-format: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38904/31338/code-format.patch e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38904/31338/code-format.patch | patch -p1 You can also run scram build code-format to apply code format directly

cmsbuild avatar Jul 30 '22 06:07 cmsbuild

please test

fwyzard avatar Jul 31 '22 13:07 fwyzard

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38904/31345

  • This PR adds an extra 36KB to repository

cmsbuild avatar Jul 31 '22 13:07 cmsbuild

A new Pull Request was created by @fwyzard (Andrea Bocci) for master.

It involves the following packages:

  • DataFormats/L1Trigger (l1)
  • EventFilter/Utilities (daq)
  • FWCore/Skeletons (core)

@smuzaffar, @Dr15Jones, @rekovic, @epalencia, @emeschi, @cecilecaillol, @makortel, @smorovic can you please review it and eventually sign? Thanks. @kreczko, @makortel, @rovere, @eyigitba, @Martin-Grunewald, @missirol, @wddgit, @thomreis, @dinyar this is something you requested to watch as well. @perrotta, @dpiparo, @qliphy, @rappoccio you are the release manager for this.

cms-bot commands are listed here

cmsbuild avatar Jul 31 '22 13:07 cmsbuild

-1

Failed Tests: Build Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23744d/26550/summary.html COMMIT: afda143e3013277733fe920c0d9369858374c7aa CMSSW: CMSSW_12_5_X_2022-07-31-0000/el8_amd64_gcc10 User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/38904/26550/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_5_X_2022-07-31-0000/src/EventFilter/Utilities/src/FastMonitoringService.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/src/EventFilter/Utilities/src/FedRawDataInputSource.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/src/EventFilter/Utilities/src/FileIO.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/src/EventFilter/Utilities/src/GlobalEventNumber.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/src/EventFilter/Utilities/src/GlobalEventNumber.cc:1:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/poison/EventFilter/Utilities/interface/GlobalEventNumber.icc:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
    1 | #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
      |  ^~~~~
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/src/EventFilter/Utilities/src/GlobalEventNumber.cc: In function 'bool evf::evtn::daq_board_sense(const unsigned char*)':
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/src/EventFilter/Utilities/src/GlobalEventNumber.cc:7:37: error: 'FEDHeader' has not been declared
    7 |       return (*(unsigned int *)(p + FEDHeader::length + DAQ_BOARDID_OFFSET * SLINK_WORD_SIZE / 2) >>

cmsbuild avatar Jul 31 '22 14:07 cmsbuild

please test

fwyzard avatar Jul 31 '22 14:07 fwyzard

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38904/31348

  • This PR adds an extra 24KB to repository

cmsbuild avatar Jul 31 '22 14:07 cmsbuild

Pull request #38904 was updated. @smuzaffar, @Dr15Jones, @rekovic, @epalencia, @emeschi, @cecilecaillol, @makortel, @smorovic can you please check and sign again.

cmsbuild avatar Jul 31 '22 14:07 cmsbuild

-1

Failed Tests: Build Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23744d/26551/summary.html COMMIT: a39dd4d3cc47f661ba2a68b2afee9cb8dd2c78ce CMSSW: CMSSW_12_5_X_2022-07-31-0000/el8_amd64_gcc10 User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/38904/26551/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

  • @dmeuser cms-sw/cmssw#38894
  • @bsunanda cms-sw/cmssw#38903
  • @hahnjo cms-sw/cmssw#38879

You can see more details here: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23744d/26551/git-recent-commits.json https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23744d/26551/git-merge-result

Build

I found compilation error when building:

/cvmfs/cms-ib.cern.ch/nweek-02744/el8_amd64_gcc10/external/gcc/10.3.0-84898dea653199466402e67d73657f10/bin/../lib/gcc/x86_64-redhat-linux-gnu/10.3.0/../../../../x86_64-redhat-linux-gnu/bin/ld: tmp/el8_amd64_gcc10/src/EventFilter/Utilities/src/EventFilterUtilities/EvFDaqDirector.cc.o: in function `evf::EvFDaqDirector::getStreamDestinations(std::__cxx11::basic_string, std::allocator > const&) const':
EvFDaqDirector.cc:(.text+0x6408): undefined reference to `Json::ValueIteratorBase::deref() const'
/cvmfs/cms-ib.cern.ch/nweek-02744/el8_amd64_gcc10/external/gcc/10.3.0-84898dea653199466402e67d73657f10/bin/../lib/gcc/x86_64-redhat-linux-gnu/10.3.0/../../../../x86_64-redhat-linux-gnu/bin/ld: EvFDaqDirector.cc:(.text+0x6456): undefined reference to `Json::ValueIterator::ValueIterator(Json::ValueIterator const&)'
/cvmfs/cms-ib.cern.ch/nweek-02744/el8_amd64_gcc10/external/gcc/10.3.0-84898dea653199466402e67d73657f10/bin/../lib/gcc/x86_64-redhat-linux-gnu/10.3.0/../../../../x86_64-redhat-linux-gnu/bin/ld: EvFDaqDirector.cc:(.text+0x645e): undefined reference to `Json::ValueIteratorBase::increment()'
/cvmfs/cms-ib.cern.ch/nweek-02744/el8_amd64_gcc10/external/gcc/10.3.0-84898dea653199466402e67d73657f10/bin/../lib/gcc/x86_64-redhat-linux-gnu/10.3.0/../../../../x86_64-redhat-linux-gnu/bin/ld: EvFDaqDirector.cc:(.text+0x6474): undefined reference to `Json::ValueIteratorBase::isEqual(Json::ValueIteratorBase const&) const'
collect2: error: ld returned 1 exit status
gmake: *** [tmp/el8_amd64_gcc10/src/EventFilter/Utilities/src/EventFilterUtilities/libEventFilterUtilities.so] Error 1
Leaving library rule at EventFilter/Utilities
Entering library rule at src/EventFilter/Utilities/plugins
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/src/EventFilter/Utilities/plugins/DaqFakeReader.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_5_X_2022-07-31-0000/src/EventFilter/Utilities/plugins/EvFFEDSelector.cc

cmsbuild avatar Jul 31 '22 15:07 cmsbuild

please test

fwyzard avatar Aug 03 '22 10:08 fwyzard

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38904/31404

  • This PR adds an extra 36KB to repository

cmsbuild avatar Aug 03 '22 10:08 cmsbuild

Pull request #38904 was updated. @smuzaffar, @Dr15Jones, @rekovic, @epalencia, @emeschi, @cecilecaillol, @makortel, @smorovic can you please check and sign again.

cmsbuild avatar Aug 03 '22 10:08 cmsbuild

please test

fwyzard avatar Aug 03 '22 10:08 fwyzard

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23744d/26617/summary.html COMMIT: 7fd3c2d21a55a368def0fd6a4aea6800b329136c CMSSW: CMSSW_12_5_X_2022-08-03-1100/el8_amd64_gcc10 User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/38904/26617/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: 51
  • DQMHistoTests: Total histograms compared: 3691510
  • DQMHistoTests: Total failures: 8
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3691480
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 50 files compared)
  • Checked 212 log files, 49 edm output root files, 51 DQM output files
  • TriggerResults: no differences found

cmsbuild avatar Aug 03 '22 16:08 cmsbuild

+core

Thanks!

makortel avatar Aug 03 '22 16:08 makortel

+l1

cecilecaillol avatar Aug 06 '22 14:08 cecilecaillol

+daq

smorovic avatar Aug 17 '22 11:08 smorovic

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. @perrotta, @dpiparo, @qliphy, @rappoccio (and backports should be raised in the release meeting by the corresponding L2)

cmsbuild avatar Aug 17 '22 11:08 cmsbuild

+1

perrotta avatar Aug 17 '22 11:08 perrotta