-
Notifications
You must be signed in to change notification settings - Fork 183
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
Update gbl to V03-01-01 and millepede to V04-16-00 #9053
Update gbl to V03-01-01 and millepede to V04-16-00 #9053
Conversation
A new Pull Request was created by @sroychow for branch IB/CMSSW_14_1_X/master. @iarspider, @smuzaffar, @aandvalenzuela, @cmsbuild can you please review it and eventually sign? Thanks. |
cms-bot internal usage |
@cmsbuild, please test |
-1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-968716/37940/summary.html External BuildI found compilation error when building: make[2]: *** [CMakeFiles/GBL.dir/build.make:135: CMakeFiles/GBL.dir/src/GblTrajectory.cpp.o] Error 1 make[2]: Leaving directory '/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/BUILD/el8_amd64_gcc12/external/gbl/V03-01-01-6f06aefc0167fb2cc2f3b2e331d7ba48/gbl-V03-01-01/build' make[1]: *** [CMakeFiles/Makefile2:888: CMakeFiles/GBL.dir/all] Error 2 make[1]: Leaving directory '/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/BUILD/el8_amd64_gcc12/external/gbl/V03-01-01-6f06aefc0167fb2cc2f3b2e331d7ba48/gbl-V03-01-01/build' make: *** [Makefile:149: all] Error 2 error: Bad exit status from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/tmp/rpm-tmp.tm6lIO (%build) RPM build errors: line 37: It's not recommended to have unversioned Obsoletes: Obsoletes: external+gbl+V03-01-01-6f06aefc0167fb2cc2f3b2e331d7ba48 Bad exit status from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/tmp/rpm-tmp.tm6lIO (%build) |
@mmusich @sroychow I think the problem is that |
thanks. The GBL developer confirmed that the ‘CMakeLists.txt’ supplied with GBL is only a default version. It should be customised by the user, e.g. for the c++ standard: # set CMAKE_CXX_STANDARD
IF( NOT ${CMAKE_VERSION} VERSION_LESS "3.1.0" )
IF( SUPPORT_ROOT )
SET( CMAKE_CXX_STANDARD 17 )
ELSE()
SET( CMAKE_CXX_STANDARD 11 )
ENDIF()
ELSE()
# defined in cmake/ilcsoft_default_cxx_flags.cmake
ENDIF() The " |
@mmusich the following patch (on top of proposed changes) should work: -- a/gbl.spec
+++ b/gbl.spec
@@ -8,6 +8,8 @@ Requires: eigen
%prep
%setup -q -n %{n}-%{realversion}
+grep -q 'CMAKE_CXX_STANDARD *11' cpp/CMakeLists.txt
+sed -i -e 's|CMAKE_CXX_STANDARD *11|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' cpp/CMakeLists.txt
%build
rm -rf build
@@ -21,11 +23,10 @@ cmake ../cpp \
-DEIGEN3_INCLUDE_DIR=${EIGEN_ROOT}/include/eigen3 \
-DSUPPORT_ROOT=False \
%ifarch x86_64
- -DCMAKE_CXX_FLAGS="-DEIGEN_MAX_ALIGN_BYTES=64 -msse3" \
+ -DCMAKE_CXX_FLAGS="-DEIGEN_MAX_ALIGN_BYTES=64 -msse3"
%else
- -DCMAKE_CXX_FLAGS="-DEIGEN_MAX_ALIGN_BYTES=64" \
+ -DCMAKE_CXX_FLAGS="-DEIGEN_MAX_ALIGN_BYTES=64"
%endif
- -DCMAKE_CXX_STANDARD=%{cms_cxx_standard} |
Pull request #9053 was updated. |
please test |
-1 Failed Tests: Build BuildI found compilation error when building: >> Compiling src/Alignment/ReferenceTrajectories/src/TrajectoryFactoryBase.cc >> Compiling src/Alignment/ReferenceTrajectories/src/TrajectoryFactoryPlugin.cc >> Compiling src/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc >> Compiling src/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectoryState.cc src/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc: In member function 'virtual bool ReferenceTrajectory::addMaterialEffectsLocalGbl(const std::vector&, const std::vector&, const std::vector&, const std::vector&)': src/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc:1027:29: error: call of overloaded 'addScatterer(Eigen::CwiseNullaryOp, Eigen::Matrix >&, const Eigen::Inverse >)' is ambiguous 1027 | aGblPoint.addScatterer(scatterer, scatPrecision.inverse()); | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /pool/condor/dir_3756739/jenkins/workspace/ib-run-pr-tests/testBuildDir/el8_amd64_gcc12/external/gbl/V03-01-01-0bb1f00d4c29125130ee01bad4382681/include/GblTrajectory.h:36, from /pool/condor/dir_3756739/jenkins/workspace/ib-run-pr-tests/CMSSW_14_1_X_2024-03-06-2300/src/Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h:103, from /pool/condor/dir_3756739/jenkins/workspace/ib-run-pr-tests/CMSSW_14_1_X_2024-03-06-2300/src/Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h:38, |
please test with cms-sw/cmssw#44340 |
-1 Failed Tests: UnitTests RelVals RelVals-INPUT The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
You can see more details here: Unit TestsI found 1 errors in the following unit tests: ---> test testPhase2PixelNtuple had ERRORS RelVals
RelVals-INPUT |
Failures are unrelated, let's try again |
test parameters: |
@cmsbuild, please test |
+1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-968716/37984/summary.html The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
You can see more details here: Comparison SummarySummary:
|
REMINDER @antoniovilela, @sextonkennedy, @rappoccio: This PR was tested with cms-sw/cmssw#44340, please check if they should be merged together |
+alca
|
+1 |
merge
|
Backport to 14.0 will also be needed. Supersedes #8976