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

Rename inline c++ files to .icc #38904

Merged
merged 4 commits into from Aug 17, 2022

Conversation

fwyzard
Copy link
Contributor

@fwyzard fwyzard commented Jul 30, 2022

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
Copy link
Contributor Author

fwyzard commented Jul 30, 2022

please test

@cmsbuild
Copy link
Contributor

-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)

@fwyzard
Copy link
Contributor Author

fwyzard commented Jul 31, 2022

please test

@cmsbuild
Copy link
Contributor

+code-checks

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

  • This PR adds an extra 36KB to repository

@cmsbuild
Copy link
Contributor

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
Copy link
Contributor

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23744d/26550/summary.html
COMMIT: afda143
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) >>


@fwyzard
Copy link
Contributor Author

fwyzard commented Jul 31, 2022

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 3, 2022

+code-checks

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

  • This PR adds an extra 36KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 3, 2022

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

@fwyzard
Copy link
Contributor Author

fwyzard commented Aug 3, 2022

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 3, 2022

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23744d/26617/summary.html
COMMIT: 7fd3c2d
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

@makortel
Copy link
Contributor

makortel commented Aug 3, 2022

+core

Thanks!

@cecilecaillol
Copy link
Contributor

+l1

@smorovic
Copy link
Contributor

+daq

@cmsbuild
Copy link
Contributor

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)

@perrotta
Copy link
Contributor

+1

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

6 participants