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

Use unique_ptr when constructing ProductHolders #12920

Merged

Conversation

Dr15Jones
Copy link
Contributor

Change the interface in Principal from auto_ptr to unique_ptr when constructing ProductHolders.

Change the interface in Principal from auto_ptr to unique_ptr when constructing ProductHolders.
@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Dr15Jones (Chris Jones) for CMSSW_8_0_X.

It involves the following packages:

FWCore/Framework

@cmsbuild, @smuzaffar, @Dr15Jones, @davidlange6 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @wddgit, @wmtan this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

Following commands in first line of a comment are recognized

  • +1|approve[d]|sign[ed]: L1/L2's to approve it
  • -1|reject[ed]: L1/L2's to reject it
  • assign <category>[,<category>[,...]]: L1/L2's to request signatures from other categories
  • unassign <category>[,<category>[,...]]: L1/L2's to remove signatures from other categories
  • hold: L1/all L2's/release manager to mark it as on hold
  • unhold: L1/user who put this PR on hold
  • merge: L1/release managers to merge this request
  • [@cmsbuild,] please test: L1/L2 and selected users to start jenkins tests
  • [@cmsbuild,] please test with cms-sw/cmsdist#<PR>: L1/L2 and selected users to start jenkins tests using externals from cmsdist

@Dr15Jones
Copy link
Contributor Author

please test

@Dr15Jones
Copy link
Contributor Author

+1

@cmsbuild
Copy link
Contributor

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/10471/console

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

davidlange6 added a commit that referenced this pull request Jan 12, 2016
Use unique_ptr when constructing ProductHolders
@davidlange6 davidlange6 merged commit c00ad84 into cms-sw:CMSSW_8_0_X Jan 12, 2016
@Dr15Jones
Copy link
Contributor Author

thanks!

@cmsbuild
Copy link
Contributor

-1
Tested at: 1a4da2a
I found a compilation error while trying to compile with clang:
I used this command:
scram b vclean && scram build -k -j 8 USER_CXXFLAGS='-fsyntax-only' COMPILER='llvm compile'

>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-01-11-1100/src/DataFormats/Provenance/src/ProductIDToBranchID.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-01-11-1100/src/DataFormats/Provenance/src/ProductProvenance.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-01-11-1100/src/DataFormats/Provenance/src/ProductProvenanceRetriever.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-01-11-1100/src/DataFormats/Provenance/src/ProductRegistry.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-01-11-1100/src/DataFormats/Provenance/src/Provenance.cc 
/tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-01-11-1100/src/DataFormats/Provenance/src/ParentageRegistry.cc:36:18: error: no member named 'emplace' in 'tbb::interface5::concurrent_unordered_mapedm::Hash<5, edm::Parentage, edm::ParentageRegistry::key_hash, std::equal_toedm::Hash<5 >, tbb::tbb_allocator, edm::Parentage> > >'
    return m_map.emplace(v.id(),std::move(v)).second;
           ~~~~~ ^
1 error generated.
gmake: **\* [tmp/slc6_amd64_gcc493/src/DataFormats/Provenance/src/DataFormatsProvenance/ParentageRegistry.o] Error 1
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2016-01-11-1100/src/DataFormats/Provenance/src/RunAux.cc 


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

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
a9ff245
49d3978
48adf22
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12920/10471/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12920/10471/git-merge-result

@Dr15Jones
Copy link
Contributor Author

llvm is unhappy? I don't think it came from this pull since that file doesn't read the header I changed.

@davidlt
Copy link
Contributor

davidlt commented Jan 12, 2016

Known issue. Needs to be fixed at TBB level to properly detect Clang in this case. You don't get C++11 emplace with Clang because Clang reports GCC 4.2.1 compatibility.

@cmsbuild
Copy link
Contributor

@Dr15Jones Dr15Jones deleted the switchToUniquePtrInPrincipal branch February 4, 2016 20:42
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.

4 participants