diff --git a/Makefile b/Makefile index 3f077a271e6..0af8decec6c 100644 --- a/Makefile +++ b/Makefile @@ -17,12 +17,12 @@ # source env_lcg.sh (if `make LCG=1` is used to build) ####################################################################### -# Hardcoded paths for standalone version identical to CMSSW 11_3_X +# Hardcoded paths for standalone version identical to CMSSW 14_1_X # These are ignored if either CONDA=1 or LCG=1 is set -BOOST = /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/boost/1.75.0-ljfedo -VDT = /cvmfs/cms.cern.ch/slc7_amd64_gcc900/cms/vdt/0.4.0-ghbfee -GSL = /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/gsl/2.6-ljfedo -EIGEN = /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/eigen/011e0db31d1bed8b7f73662be6d57d9f30fa457a +BOOST = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/boost/1.80.0-87b5de10acd2f2c8a325345ad058b814 +VDT = /cvmfs/cms.cern.ch/el9_amd64_gcc12/cms/vdt/0.4.3-793cee1e1edef0e54b2bd5cb1f69aec9 +GSL = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/gsl/2.6-5e2ce72ea2977ff21a2344bbb52daf5c +EIGEN = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/eigen/3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e-3ca740c03e68b1a067f3ed0679234a78 # Compiler and flags ----------------------------------------------------------- CXX = $(shell root-config --cxx) ROOTCFLAGS = $(shell root-config --cflags) diff --git a/docs/index.md b/docs/index.md index d09350c16cc..785e8a9d525 100644 --- a/docs/index.md +++ b/docs/index.md @@ -135,9 +135,9 @@ make -j 4 You will need to source `env_standalone.sh` each time you want to use the package, or add it to your login environment. -##### Compilation on lxplus9 +##### Compilation of slc7 compatible versions -For slc9 architectures, you will need to do the compilation in an slc7 environment using apptainer. You can then source the standalone script outside of the apptainer. +For Combine versions before v10 release you will need to do the compilation in an slc7 environment using apptainer. You can then source the standalone script outside of the apptainer. On lxplus this can be done as follows: ``` diff --git a/env_standalone.sh b/env_standalone.sh index d9be6607c26..6a36fe6fb63 100644 --- a/env_standalone.sh +++ b/env_standalone.sh @@ -1,15 +1,14 @@ -# equivalent to CMSSW 11_3_0 -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/gcc/9.3.0/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/lcg/root/6.22.08-ljfedo/etc/profile.d/init.sh +# equivalent to CMSSW 14_1_X +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/gcc/12.3.1-40d504be6370b5a30e3947a6e575ca28/etc/profile.d/init.sh +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/lcg/root/6.30.07-8b1a11e1ef0e074fdfd44e162b27e71c/etc/profile.d/init.sh # this also provides py3-six -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/py2-six/1.15.0-ljfedo/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/py3-pandas/1.2.2/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/gsl/2.6-ljfedo/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/tbb/2020_U3-ljfedo/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/cms/vdt/0.4.0-ghbfee/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/boost/1.75.0-ljfedo/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/pcre/8.43-bcolbf/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/slc7_amd64_gcc900/external/eigen/011e0db31d1bed8b7f73662be6d57d9f30fa457a/etc/profile.d/init.sh +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/py3-pandas/2.0.1-7e0980e2f417a1fc2106b953723ea098/etc/profile.d/init.sh +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/gsl/2.6-5e2ce72ea2977ff21a2344bbb52daf5c/etc/profile.d/init.sh +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/tbb/v2021.9.0-7e31cf78e4a7495ff0337c859d1dc314/etc/profile.d/init.sh +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/cms/vdt/0.4.3-793cee1e1edef0e54b2bd5cb1f69aec9/etc/profile.d/init.sh +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/boost/1.80.0-87b5de10acd2f2c8a325345ad058b814/etc/profile.d/init.sh +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/pcre/8.43-e34796d17981e9b6d174328c69446455/etc/profile.d/init.sh +. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/eigen/3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e-3ca740c03e68b1a067f3ed0679234a78/etc/profile.d/init.sh export PATH=${PATH}:${PWD}/build/bin export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PWD}/build/lib export PYTHONPATH=${PYTHONPATH}:${PWD}/build/lib/python