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

Support for TensorFlow 2.1 #28711

Merged
merged 14 commits into from
Feb 26, 2020
Merged

Support for TensorFlow 2.1 #28711

merged 14 commits into from
Feb 26, 2020

Conversation

riga
Copy link
Contributor

@riga riga commented Jan 6, 2020

This PR provides changes to the PhysicsTools/TensorFlow interface to support TensorFlow 2.1.

It should be tested with cms-sw/cmsdist#5427 cms-sw/cmsdist#5525.

As documented in cms-sw/cmsdist#5427 (comment) , one of the tests (AOT compilation) currently fails. It requires a change to the--entry_point argument in the cmssw-config/SCRAM/GMake/Makefile.dnn build rule, which - as far as I can see - is no longer allowed to start with two underscores as of 2.0 (@smuzaffar). The [WIP] label can be removed once this is settled. All other tests pass.

The changes solely focus on 2.0 compatibility and thus target CPU support only. GPU support is planned and will be subject to a future PR, which will also contain features to simplify device placement and working with GPU memory (in coordination with the Patatrack team).

Smaller changes:

  • Added PhysicsTools/TensorFlow/python/tools.py to aid graph reading and writing.
  • Updated DQMServices/Core/src/ROOTFilePB.pb.{cc,h} for the new protobuf version (via protoc --cpp_out=`pwd` ROOTFilePB.proto).

Edit: Performance comparison of the DeepJet model (from #28711 (comment) below, using testDeepJetPerformance.cc):

TF vs. ONNX

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28711/13293

  • This PR adds an extra 56KB to repository

@smuzaffar
Copy link
Contributor

test parameters

@smuzaffar
Copy link
Contributor

please test
thanks @riga

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2020

The tests are being triggered in jenkins.
Tested with other pull request(s) cms-sw/cmsdist#5427
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4139/console Started: 2020/01/06 12:50
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4143/console Started: 2020/01/06 15:24
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4146/console Started: 2020/01/06 18:09

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2020

A new Pull Request was created by @riga (Marcel R.) for master.

It involves the following packages:

DQMServices/Core
PhysicsTools/TensorFlow

@perrotta, @andrius-k, @kmaeshima, @schneiml, @cmsbuild, @jfernan2, @fioriNTU, @slava77, @santocch can you please review it and eventually sign? Thanks.
@makortel, @barvic this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos, @silviodonato you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28711/13296

  • This PR adds an extra 56KB to repository

@perrotta
Copy link
Contributor

@santocch can you please have a look, and sign if you think so?

@cmsbuild cmsbuild mentioned this pull request Feb 24, 2020
@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 25, 2020

The tests are being triggered in jenkins.
Tested with other pull request(s) cms-sw/cmsdist#5525,cms-data/RecoTauTag-TrainingFiles#4
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4855/console Started: 2020/02/25 10:19

@cmsbuild
Copy link
Contributor

+1
Tested at: a0fd1e2
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3c700e/4855/summary.html
CMSSW: CMSSW_11_1_X_2020-02-24-2300
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

Comparison job queued.

@santocch
Copy link

+1

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

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 6 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2695371
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2695049
  • DQMHistoTests: Total skipped: 319
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 147 log files, 16 edm output root files, 34 DQM output files

@silviodonato
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 2c13f14 into cms-sw:master Feb 26, 2020
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Feb 27, 2020
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.