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

Rebase of the CMSSW_7_1_THREADED_X branch on top of CMSSW_7_1_X #3461

Merged
merged 50 commits into from Apr 28, 2014

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Apr 23, 2014

This was done via:

git checkout -b rebased-threaded origin/CMSSW_7_1_THREADED_X
git rebase -X theirs origin/CMSSW_7_1_X

and results in the same differences w.r.t. CMSSW_7_1_X that are there between CMSSW_7_1_X and CMSSW_7_1_THREADED_X.

Try to do that with CVS… :-)

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @ktf (Giulio Eulisse) for CMSSW_7_1_X.

Rebase of the CMSSW_7_1_THREADED_X branch on top of CMSSW_7_1_X

It involves the following packages:

DQM/SiStripCommon
DQM/SiStripMonitorClient
DQMServices/Core
DataFormats/Common
DataFormats/Streamer
FWCore/Framework
FWCore/PluginManager
FWCore/RootAutoLibraryLoader
FWCore/ServiceRegistry
FWCore/Services
FWCore/Utilities
IOMC/RandomEngine
IOPool/Input
MagneticField/ParametrizedEngine
PerfTools/Callgrind
RecoTracker/TkMSParametrization
SimCalorimetry/EcalSimAlgos
TrackPropagation/Geant4e

@civanch, @ojeda, @danduggan, @mdhildreth, @cmsbuild, @anton-a, @Dr15Jones, @rovere, @deguio, @slava77, @Degano, @ktf, @thspeer, @nclopezo can you please review it and eventually sign? Thanks.
@ghellwig, @namapane, @wmtan, @GiacomoSguazzoni, @rovere, @argiro, @gpetruc, @cerati, @venturia this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@Dr15Jones
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

-1
I found an error when building:

>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-23-0200/src/SimCalorimetry/HcalSimAlgos/src/HcalShape.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-23-0200/src/SimCalorimetry/HcalSimAlgos/src/HcalShapes.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-23-0200/src/SimCalorimetry/HcalSimAlgos/src/HcalSiPM.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-23-0200/src/SimCalorimetry/HcalSimAlgos/src/HcalSiPMHitResponse.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-23-0200/src/SimCalorimetry/HcalSimAlgos/src/HcalSiPMRecovery.cc 
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-23-0200/src/SimCalorimetry/HcalSimAlgos/src/HcalAmplifier.cc:25:1: error: prototype for 'HcalAmplifier::HcalAmplifier(const CaloVSimParameterMap*, bool, bool, bool)' does not match any in class 'HcalAmplifier'
 HcalAmplifier::HcalAmplifier(const CaloVSimParameterMap \* parameters, bool addNoise, bool PreMix1, bool PreMix2) :
 ^
In file included from /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-23-0200/src/SimCalorimetry/HcalSimAlgos/src/HcalAmplifier.cc:1:0:
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-23-0200/src/SimCalorimetry/HcalSimAlgos/interface/HcalAmplifier.h:23:7: error: candidates are: constexpr HcalAmplifier::HcalAmplifier(const HcalAmplifier&)
 class HcalAmplifier {


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

@ktf
Copy link
Contributor Author

ktf commented Apr 23, 2014

This is unrelated and due to recent automatic merge of CMSSW_7_0_X into CMSSW_7_1_X. @mdhildreth is working on fixing it. Resubmit tests once fixed.

@cmsbuild
Copy link
Contributor

-1
I found an error when building:

>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/DQMServices/Core/src/QStatisticalTests.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/DQMServices/Core/src/QTest.cc 
In file included from /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/DQMServices/Core/interface/DQMEDAnalyzer.h:7:0,
                 from /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/DQMServices/Core/src/DQMEDAnalyzer.cc:1:
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/DQMServices/Core/interface/DQMStore.h: In member function 'virtual void thread_unsafe::DQMEDAnalyzer::beginRun(const edm::Run&, const edm::EventSetup&)':
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/DQMServices/Core/interface/DQMStore.h:252:7: error: 'oldModuleId' may be used uninitialized in this function [-Werror=maybe-uninitialized]
       moduleId_ = oldModuleId;
       ^
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/DQMServices/Core/interface/DQMStore.h:239:33: note: 'oldModuleId' was declared here
     uint32_t oldRun,oldStreamId,oldModuleId;
                                 ^


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

@ktf
Copy link
Contributor Author

ktf commented Apr 24, 2014

Wrong IB. Tests restarted.

@cmsbuild
Copy link
Contributor

-1
I found an error when building:

Entering library rule at src/GeneratorInterface/AMPTInterface/test
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-1400/src/GeneratorInterface/SherpaInterface/src/SherpaHadronizer.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-1400/src/GeneratorInterface/SherpaInterface/src/SherpackFetcher.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-1400/src/GeneratorInterface/SherpaInterface/src/SherpackUtilities.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-1400/src/GeneratorInterface/Herwig6Interface/plugins/Herwig6Hadronizer.cc 
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-1400/src/GeneratorInterface/SherpaInterface/src/SherpaHadronizer.cc:17:47: fatal error: SHERPA/Tools/Input_Output_Handler.H: No such file or directory
 #include "SHERPA/Tools/Input_Output_Handler.H"
                                               ^
compilation terminated.
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-1400/src/GeneratorInterface/SherpaInterface/src/SherpaHadronizer.cc:17:47: fatal error: SHERPA/Tools/Input_Output_Handler.H: No such file or directory
 #include "SHERPA/Tools/Input_Output_Handler.H"


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

@ktf
Copy link
Contributor Author

ktf commented Apr 24, 2014

Mmmm... no idea why this is still failing... :-/ Looking again into it.

@cmsbuild
Copy link
Contributor

-1
I ran the usual tests and I found errors in the following unit tests:

---> test TestFWCoreServicesDriver had ERRORS
---> test TestFWCoreFrameworkESProducerLooper had ERRORS
---> test TestFWCoreFrameworkESRefer had ERRORS
---> test TestFWCoreFrameworkUnscheduled had ERRORS
---> test TestFWCoreFrameworkTrigMask had ERRORS
---> test TestFWCoreFrameworkGlobalStreamOne had ERRORS
---> test TestFWCoreFrameworkDeleteEarly had ERRORS
---> test TestFWCoreFrameworkReplace had ERRORS
---> test TestPoolInput had ERRORS
---> test TestXMLSafeException had ERRORS
---> test TestIOMCRandomEngineService had ERRORS
---> test TestFWCoreFrameworkInputTagFailure had ERRORS
---> test TestFWCoreFrameworkTBBTasks had ERRORS
---> test TestFWCoreFrameworkeventprocessor had ERRORS
---> test TestFWCoreFrameworkTrigBit had ERRORS

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

@Dr15Jones
Copy link
Contributor

The log says the tests are seg faulting.

@ktf
Copy link
Contributor Author

ktf commented Apr 28, 2014

Not sure what is going on. Both CMSSW and CMSDIST for this pull request are identical to the threaded branch, which works fine. Investigating if this is a local tests vs full release issue.

@ktf
Copy link
Contributor Author

ktf commented Apr 28, 2014

Ok, I think I understood the problem. At some point we added changes -a to -A in the checkdeps, but the correct thing to do would have been to have both, since the git cms-merge-topic is invoked with -u when running in the jenkins tests. I've restarted the tests. Keep the faith.

@cmsbuild
Copy link
Contributor

-1
I ran the usual tests and I found errors in the following unit tests:

---> test testUtilitiesStorageFactory had ERRORS
---> test testUtilitiesRFIOAdaptor had ERRORS

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

@ktf
Copy link
Contributor Author

ktf commented Apr 28, 2014

Test failures are glitches in fetching files from castor. All the rest seems ok.

@ktf
Copy link
Contributor Author

ktf commented Apr 28, 2014

+1

@ktf
Copy link
Contributor Author

ktf commented Apr 28, 2014

@deguio @civanch can you review ASAP?

@cmsbuild
Copy link
Contributor

@ktf
Copy link
Contributor Author

ktf commented Apr 28, 2014

Bypassing simulation and DQM to get this in an IB.This is the last show stopper for pre7. Complain if not ok.

ktf added a commit that referenced this pull request Apr 28, 2014
Multithreading -- Rebase of the CMSSW_7_1_THREADED_X branch on top of CMSSW_7_1_X
@ktf ktf merged commit 44b7eb1 into cms-sw:CMSSW_7_1_X Apr 28, 2014
@ktf ktf deleted the rebased-threaded branch June 16, 2014 10:20
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

7 participants