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

Merge 74x into 75x #8357

Merged
merged 129 commits into from Mar 19, 2015
Merged

Merge 74x into 75x #8357

merged 129 commits into from Mar 19, 2015

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Mar 17, 2015

Merge by hand changes, since they involved a file which got removed in CMSSW_7_5_X.

VinInn and others added 30 commits February 10, 2015 10:24
…g configurations

The import of SiStripClusterChargeCut_cfi was needed because the
import of seeding layer configuration adds the *SeedLayers* modules to
the cms.Process when load()ed. If the *SeedLayers* modules are
imported with "as" and a name beginning with an underscore, these
names do not end up in cms.Process, and we can avoid importing
SiStripClusterChargeCut_cfi here.
- keep one image saving thread per eve view;
- reuse FBO objects (as long as they keep the same size);
- reuse intermediate buffers for image creation.
All this shaves off about 10% of execution time when saving 5 extremely large images.

(cherry picked from commit 6a97d6d)
(cherry picked from commit d10d3cb)
@davidlange6
Copy link
Contributor

merging this one so that I can catch up with 74x items. looks like the tests will go ok this time.

davidlange6 added a commit that referenced this pull request Mar 19, 2015
@davidlange6 davidlange6 merged commit 2a25e2c into cms-sw:CMSSW_7_5_X Mar 19, 2015
@cmsbuild
Copy link
Contributor

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

In file included from /afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc491/cms/cmssw-patch/CMSSW_7_5_X_2015-03-18-2300/src/DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h:7:
In file included from /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_7_5_X_2015-03-18-2300/src/DataFormats/Math/interface/AlgebraicROOTObjects.h:13:
In file included from /afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc491/lcg/root/5.34.22-cms3/include/Math/SVector.h:367:
In file included from /afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc491/lcg/root/5.34.22-cms3/include/Math/BinaryOperators.h:22:
In file included from /afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc491/lcg/root/5.34.22-cms3/include/Math/BinaryOpPolicy.h:22:
/afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc491/lcg/root/5.34.22-cms3/include/Math/MatrixRepresentationsStatic.h:176:24: fatal error: recursive template instantiation exceeded maximum depth of 256
      typedef typename make_indices_impl,
                       ^
/afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc491/lcg/root/5.34.22-cms3/include/Math/MatrixRepresentationsStatic.h:176:24: note: in instantiation of template class 'ROOT::Math::rowOffsetsUtils::make_indices_impl<248, ROOT::Math::rowOffsetsUtils::indices<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247>, 289>' requested here
      typedef typename make_indices_impl,
                       ^


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

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-8357/3625/summary.html
There are some workflows for which there are errors in the baseline:
401.0 step 1
The results for the comparisons for these workflows could be incomplete
This means most likely that the IB is having errors in the relvals

@lveldere
Copy link
Contributor

401 is a fastsim workflow.
can someone point me to the error log?
I fail to find it.
A bit strange is that 401 shares step1 with 400.
There is apparently no issue with 400, unless 400 is not tested?

@nclopezo
Copy link
Contributor

Hi @lveldere, here you can see the log for 401 in CMSSW_7_5_X_2015-03-18-2300. But I see that after #8357 was merged, the error seems to be fixed. The validation of CMSSW_7_5_X_2015-03-19-2300 is currently running and the results should start to be available later today. So cms-bot should not complain about it anymore.

@lveldere
Copy link
Contributor

thanks!

On Fri, Mar 20, 2015 at 10:02 AM, David Mendez notifications@github.com
wrote:

Hi @lveldere https://github.com/lveldere, here
https://cmssdt.cern.ch/SDT/cgi-bin/buildlogs/slc6_amd64_gcc491/CMSSW_7_5_X_2015-03-18-2300/pyRelValMatrixLogs/run/401.0_TTbarNewMix+TTbarFSPU+HARVESTFS+MINIAODMCUP15FS/step1_TTbarNewMix+TTbarFSPU+HARVESTFS+MINIAODMCUP15FS.log
you can see the log for 401 in CMSSW_7_5_X_2015-03-18-2300
https://cmssdt.cern.ch/SDT/html/showIB.html#CMSSW_7_5_X_2015-03-18-2300.
But I see that after #8357 #8357
was merged, the error seems to be fixed. The validation of
CMSSW_7_5_X_2015-03-19-2300
https://cmssdt.cern.ch/SDT/html/showIB.html#CMSSW_7_5_X_2015-03-19-2300
is currently running and the results should start to be available later
today. So cms-bot should not complain about it anymore.


Reply to this email directly or view it on GitHub
#8357 (comment).

@ktf ktf deleted the merge-74x-into-75x branch March 20, 2015 10:43
@davidlt
Copy link
Contributor

davidlt commented Mar 20, 2015

@wmtan my guess that defaults on GCC and Clang are different and we hit the limit on Clang. On GCC 5.0 there was also a change to make "Make excessive template instantiation depth a fatal error" as extremely deep recursion is causing stack overflows in compiler while trying to handle it. I will look if it compiles fine in Clang in next several days. If no, I will increate the limit on Clang.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment