iLCSoft v02-03-04 release on EL/Alma9

docker/cvmfs-install/Dockerfile.cvmfs-install.alma9

@@ -0,0 +1,38 @@
+FROM gitlab-registry.cern.ch/linuxsupport/alma9-base
+
+LABEL product="iLCSoft-cvmfs-install-alma9"
+LABEL maintainer="thomas.madlener@desy.de"
+LABEL description="Image to install iLCSoft on CVMFS for Alma9"
+LABEL os="Alma9"
+
+RUN dnf update -y && \
+    dnf groupinstall -y "Development Tools" && \
+    dnf install -y \
+      curl \
+      wget \
+      openssl-devel \
+      freeglut-devel \
+      tar \
+      bzip2 \
+      which \
+      libX11-devel \
+      libXext-devel \
+      libXmu-devel \
+      libXft-devel \
+      libXpm-devel \
+      doxygen \
+      libuuid-devel \
+      perl-core \
+      glibc-locale-source \
+      glibc-langpack-en \
+      subversion && \
+   dnf clean all && rm -rf /var/cache/yum
+
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8 \
+    LC_CTYPE=en_US.UTF-8
+
+RUN localedef -i en_US -f UTF-8 en_US.UTF-8
+
+CMD ["/bin/bash"]

ilcsoft/__init__.py

@@ -33,6 +33,7 @@
 from .pandoranew import PandoraAnalysis
 from .pandoranew import MarlinPandora
 from .lcfivertex import LCFIVertex
+from .lcfiplus import LCFIPlus
 from .eutelescope import Eutelescope
 from .overlay import Overlay
 from .marlintpc import MarlinTPC

ilcsoft/boost.py

@@ -44,19 +44,21 @@ def setMode(self, mode):
         BaseILC.setMode(self, mode)
 
         if( self.mode == "install" ):
-            if( Version( self.version ) > "1.76.0" ):
-                # Example: https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz
-                self.download.url = "https://boostorg.jfrog.io/artifactory/main/release/%s/source/boost_%s.tar.gz" % (self.version, self.version.replace( "." , "_" ) )
-            elif( Version( self.version ) > "1.70.0" ):
-                # https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.gz
-                self.download.url = "https://boostorg.jfrog.io/artifactory/main/release/%s/source/boost_%s.tar.gz" % (self.version, self.version.replace( "." , "_" ) )
-            elif( Version( self.version ) > "1.63.0" ):
-                # Example: https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz
-                self.download.url = "https://dl.bintray.com/boostorg/release/%s/source/boost_%s.tar.gz" % (self.version, self.version.replace( "." , "_" ) )
-
-            else:
-                # Example: https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.gz
-                self.download.url = "https://sourceforge.net/projects/boost/files/boost/%s/boost_%s.tar.gz" % (self.version, self.version.replace( "." , "_" ) )
+            self.download.url = f"https://sourceforge.net/projects/boost/files/boost/{self.version}/boost_{self.version.replace('.', '_')}.tar.gz"
+
+            # if( Version( self.version ) > "1.76.0" ):
+            #     # Example: https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz
+            #     self.download.url = "https://boostorg.jfrog.io/artifactory/main/release/%s/source/boost_%s.tar.gz" % (self.version, self.version.replace( "." , "_" ) )
+            # elif( Version( self.version ) > "1.70.0" ):
+            #     # https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.gz
+            #     self.download.url = "https://boostorg.jfrog.io/artifactory/main/release/%s/source/boost_%s.tar.gz" % (self.version, self.version.replace( "." , "_" ) )
+            # elif( Version( self.version ) > "1.63.0" ):
+            #     # Example: https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz
+            #     self.download.url = "https://dl.bintray.com/boostorg/release/%s/source/boost_%s.tar.gz" % (self.version, self.version.replace( "." , "_" ) )
+
+            # else:
+            #     # Example: https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.gz
+            #     self.download.url = "https://sourceforge.net/projects/boost/files/boost/%s/boost_%s.tar.gz" % (self.version, self.version.replace( "." , "_" ) )
         self.cmakeconfig = self.installPath + "/lib/cmake/Boost-" + self.version
 
     def compile(self):

ilcsoft/gear.py

@@ -23,8 +23,8 @@ def __init__(self, userInput):
         self.reqmodules = [ "CLHEP" ]
 
         self.reqfiles = [
-                ["lib/libgear.a", "lib/libgear.so", "lib/libgear.dylib"],
-                ["lib/libgearxml.a", "lib/libgearxml.so", "lib/libgearxml.dylib"]
+                ["lib64/libgear.a", "lib64/libgear.so", "lib/libgear.a", "lib/libgear.so", "lib/libgear.dylib"],
+                ["lib64/libgearxml.a", "lib64/libgearxml.so", "lib/libgearxml.a", "lib/libgearxml.so", "lib/libgearxml.dylib"]
         ]
 
     def compile(self):

ilcsoft/lcfiplus.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+
+from .marlinpkg import MarlinPKG
+from .baseilc import BaseILC
+
+
+class LCFIPlus(MarlinPKG):
+    """LCFIPlus configuration for installing and configuring LCFIPlus"""
+
+    def __init__(self, userInput):
+        MarlinPKG.__init__(self, "LCFIPlus", userInput)
+
+        self.reqmodules = ["LCIO", "GEAR", "ROOT", "Marlin", "MarlinUtil", "LCFIVertex"]
+        self.reqfiles = [["lib/libLCFIPlus.so", "lib/LCFIPlus.dylib"]]
+
+        self.download.type = "Github"
+        self.download.gituser = "lcfiplus"
+        self.download.gitrepo = "LCFIPlus"
+
+    def postCheckDeps(self):
+        BaseILC.postCheckDeps(self)
+
+        self.parent.module("Marlin").envpath["MARLIN_DLL"].append(
+            f"{self.installPath}/install/lib/libLCFIPlus{self.shlib_ext}"
+        )
+        self.envpath["ROOT_INCLUDE_PATH"].append(f"{self.installPath}/include")
+        self.envpath["LD_LIBRARY_PATH"].append(f"{self.installPath}/install/lib")

ilcsoft/lcfivertex.py

@@ -23,8 +23,8 @@ def __init__(self, userInput):
 
         # optional modules
         self.optmodules = [ "AIDA" ]
-        self.reqfiles = [ ["lib/libLCFIVertex.so", "lib/libLCFIVertex.dylib" ],
-                          ["lib/libLCFIVertexProcessors.so", "lib/libLCFIVertexProcessors.dylib"] ]
+        self.reqfiles = [ ["install/lib/libLCFIVertex.so", "install/lib/libLCFIVertex.dylib" ],
+                          ["install/lib/libLCFIVertexProcessors.so", "install/lib/libLCFIVertexProcessors.dylib"] ]
 
         # cvs root
         self.download.root="marlinreco"
@@ -40,9 +40,9 @@ def postCheckDeps(self):
 
         # fill MARLIN_DLL
         self.parent.module('Marlin').envpath["MARLIN_DLL"].append(
-          self.installPath+"/lib/libLCFIVertexProcessors"+self.shlib_ext )
+          self.installPath+"/install/lib/libLCFIVertexProcessors"+self.shlib_ext )
 
-        self.envpath["LD_LIBRARY_PATH"].append( self.installPath+"/lib" )
+        self.envpath["LD_LIBRARY_PATH"].append( self.installPath+"install/lib" )
 
 #        print "+ Unpacking Boost..."
 #        os.chdir( self.installPath )

ilcsoft/lcio.py

@@ -104,4 +104,4 @@ def postCheckDeps(self):
             self.envpath["LD_LIBRARY_PATH"].append( "$LCIO/lib64" )
         self.envpath["PYTHONPATH"].append( "$LCIO/python" )
         self.envpath["PYTHONPATH"].append( "$LCIO/python/examples" )
-
+        self.envpath["ROOT_INCLUDE_PATH"].append( self.installPath + "/include" )

ilcsoft/marlin.py

@@ -22,7 +22,8 @@ def __init__(self, userInput):
         self.download.gituser = 'iLCSoft'
         self.download.gitrepo = 'Marlin'
 
-        self.reqfiles = [ ["lib/libMarlin.a", "lib/libMarlin.so", "lib/libMarlin.dylib"], ["bin/Marlin"] ]
+        self.reqfiles = [ ["lib/libMarlin.a", "lib/libMarlin.so", "lib/libMarlin.dylib"
+                           "lib64/libMarlin.a", "lib64/libMarlin.so"], ["bin/Marlin"] ]
 
         # LCIO is required for building Marlin
         self.reqmodules = [ "LCIO", "GEAR" ]

ilcsoft/marlinpkg.py

@@ -37,7 +37,13 @@ def __init__(self, name, userInput):
         # Marlin packages just provide libraries. 
         # They are not supposed to be found via CMake 
         self.hasCMakeFindSupport = False
-
+
+    def setMode(self, mode):
+        BaseILC.setMode(self, mode)
+
+        self.envcmake["CMAKE_INSTALL_PREFIX"] = self.installPath + "/install"
+        self.cmakeconfig = self.installPath + "/install"
+
     def compile(self):
         """ compile MarlinPKG """
 
@@ -59,8 +65,8 @@ def compile(self):
 
     def checkInstall(self, abort=True):
         BaseILC.checkInstall(self)
-        if self.name not in ("MarlinUtil", "PandoraPFANew", "Physsim", "LCFIVertex"):
-            for libdir in ("/lib/", "/lib64/"):
+        if self.name not in ("MarlinUtil", "PandoraPFANew", "Physsim", "LCFIVertex", "LCFIPlus"):
+            for libdir in ("/install/lib/", "/install/lib64/"):
                 libname = self.installPath + libdir + "lib" + self.name + self.shlib_ext
                 print("MarlinDLL: looking for ", libname)
                 if os.path.exists(libname):

ilcsoft/qt5.py

@@ -23,7 +23,7 @@ def __init__(self, userInput):
         self.hasCMakeFindSupport = True
         self.download.supportHEAD = False
         self.download.supportedTypes = [ "git" ] 
-        self.download.svnurl = 'https://github.com/qt/qt5.git'
+        self.download.svnurl = 'https://code.qt.io/qt/qt5.git'
 
         self.reqfiles = [
             ["lib/libQt5Core.so", "lib64/libQt5Core.so", "lib/libQt5Core.dylib", "lib/libQt5Core.la"],
@@ -95,7 +95,7 @@ def compile(self):
         qt_cfg_options = " -opensource -confirm-license -nomake tests -make libs "
         cxxStandard = self.envcmake.get("CMAKE_CXX_STANDARD", None)
         if cxxStandard:
-            qt_cfg_options += " -c++std c++" + str(cxxStandard)
+            qt_cfg_options += " -c++std c++17"
 
         if( os_system( "../" + self.name + "/configure -prefix " + self.installPath + qt_cfg_options
                 + " 2>&1 | tee -a " + self.logfile ) != 0 ):

ilcsoft/root.py

@@ -113,9 +113,9 @@ def compile(self):
         if Version(self.version) < "6.30":
             self.envcmake.setdefault( 'gsl_shared',     'ON' )
             self.envcmake.setdefault( 'builtin_gsl',    'OFF' ) # we provide GSL, don't recompile it !
+            self.envcmake.setdefault( 'minuit2',        'ON' )
 
         self.envcmake.setdefault( 'gdml',           'ON' )
-        self.envcmake.setdefault( 'minuit2',        'ON' )
         self.envcmake.setdefault( 'roofit',         'ON' )
         self.envcmake.setdefault( 'unuran',         'ON' )
         self.envcmake.setdefault( 'xrootd',         'ON' )
@@ -138,9 +138,12 @@ def compile(self):
             # Need to symlink two cmake scripts that are not installed properly
             # otherwise and would break packages that depend on ROOT
             for mod in ['RootMacros.cmake', 'RootTestDriver.cmake']:
-                link_path = os.path.join(self.installPath, 'cmake', mod)
-                src = os.path.join(self.installPath, 'cmake', 'modules', mod)
-                os.symlink(src, link_path)
+                try:
+                    link_path = os.path.join(self.installPath, 'cmake', mod)
+                    src = os.path.join(self.installPath, 'cmake', 'modules', mod)
+                    os.symlink(src, link_path)
+                except FileExistsError:
+                    pass
 
     def postCheckDeps(self):
         BaseILC.postCheckDeps(self)

ilcsoft/util.py

@@ -34,7 +34,7 @@ def os_system( cmd ):
     """ forces os.system calls wto use bash """
     cmd = cmd.replace('"',r'\"')
     ##print('os_system: ', 'bash -c "'+cmd+'"')
-    return os.system('pwd ; bash -c "'+cmd+'"')
+    return os.system('pwd ; bash -o pipefail -c "'+cmd+'"')
 
 #--------------------------------------------------------------------------------
 

ilcsoft/xercesc.py

@@ -33,7 +33,7 @@ def __init__(self, userInput):
         ]]
     def setMode(self, mode):
         BaseILC.setMode(self, mode)
-        self.cmakeconfig = self.installPath + "/lib/cmake/XercesC"
+        self.cmakeconfig = self.installPath
 
     def compile(self):
         """ compile XercesC """

releases/v02-03/release-base.cfg

@@ -118,9 +118,8 @@ geant4.envcmake["GEANT4_USE_SYSTEM_EXPAT"]='OFF' # ignored ??
 geant4.envcmake["GEANT4_USE_SYSTEM_CLHEP"]='ON'
 geant4.envcmake["GEANT4_USE_OPENGL_X11"]='ON'
 geant4.envcmake["GEANT4_USE_QT"]='ON' # requires qt
+geant4.envcmake["QT_QMAKE_EXECUTABLE"] = os.environ["QT_QMAKE_EXECUTABLE"]
 geant4.envcmake["GEANT4_BUILD_TLS_MODEL"]= 'global-dynamic'
-#geant4.envcmake["GEANT4_BUILD_CXXSTD"]='c++' + str(cxx_standard)
-geant4.envcmake["GEANT4_BUILD_CXXSTD"]=str(cxx_standard)
 geant4.envcmake["GEANT4_INSTALL_DATA_TIMEOUT"]='7200'
 
 #geant4.envcmake["QT_QMAKE_EXECUTABLE"]=/path/to/qmake
@@ -132,11 +131,12 @@ ilcsoft.install( ROOT( ROOT_version ))
 ilcsoft.module("ROOT").download.type="wget"
 ilcsoft.module("ROOT").envcmake['root7']="ON"
 ilcsoft.module("ROOT").envcmake['webgui']="ON"
+ilcsoft.module("ROOT").envcmake['builtin_xrootd'] = "OFF"
 
 ilcsoft.install( CLHEP( CLHEP_version ))
 ilcsoft.install( GSL( GSL_version ))
 ilcsoft.module("GSL").use_c11=True
-ilcsoft.install( Qt5( Qt5_version ))
+# ilcsoft.install( Qt5( Qt5_version ))
 
 # cmake
 ilcsoft.install( CMake( CMake_version ))

releases/v02-03/release-ilcsoft.cfg

@@ -95,14 +95,12 @@ ilcsoft.module("Marlin").envcmake["MARLIN_GUI"]='OFF'
 ilcsoft.install( MarlinPKG( "MarlinDD4hep", MarlinDD4hep_version ))
 ilcsoft.module("MarlinDD4hep").addDependency( [ 'Marlin', 'DD4hep', 'Root', 'DDKalTest'] )
 
-ilcsoft.install( MarlinPKG( "DDMarlinPandora", DDMarlinPandora_version ))
-ilcsoft.module("DDMarlinPandora").addDependency( [ 'Marlin', 'MarlinUtil', 'DD4hep', 'ROOT', 'PandoraPFANew', 'MarlinTrk'] )
-ilcsoft.module("DDMarlinPandora").envcmake["CMAKE_CXX_FLAGS"]='-Wno-error'
-
-
 ilcsoft.install( MarlinUtil( MarlinUtil_version ))
 ilcsoft.module("MarlinUtil").envcmake["USE_EXTERNAL_CATCH2"]="OFF"
 
+ilcsoft.install( MarlinPKG( "DDMarlinPandora", DDMarlinPandora_version ))
+ilcsoft.module("DDMarlinPandora").addDependency( [ 'Marlin', 'MarlinUtil', 'DD4hep', 'ROOT', 'PandoraPFANew', 'MarlinTrk'] )
+ilcsoft.module("DDMarlinPandora").envcmake["CMAKE_CXX_FLAGS"]='-Wno-error'
 
 #----------  standard reco packages
 
@@ -119,7 +117,7 @@ ilcsoft.module("PandoraPFANew").envcmake["PANDORA_MONITORING"]='ON'
 ilcsoft.module("PandoraPFANew").envcmake["LC_PANDORA_CONTENT"]='ON'
 ilcsoft.module("PandoraPFANew").envcmake["EXAMPLE_PANDORA_CONTENT"]='ON'
 ilcsoft.module("PandoraPFANew").envcmake["CMAKE_PREFIX_PATH"]='${ROOTSYS}/cmake'
-ilcsoft.module("PandoraPFANew").envcmake["CMAKE_CXX_FLAGS"]='-std=c++%s' % cxx_standard
+ilcsoft.module("PandoraPFANew").envcmake["CMAKE_CXX_FLAGS"]='-std=c++%s -Wno-parentheses' % cxx_standard
 
 
 ilcsoft.install( LCFIVertex( LCFIVertex_version ))
@@ -172,11 +170,7 @@ ilcsoft.module("FCalClusterer").download.gituser="FCALSW"
 ilcsoft.module("FCalClusterer").download.gitrepo="FCalClusterer"
 ilcsoft.module("FCalClusterer").addDependency( [ 'DD4hep', 'LCIO', 'ROOT', 'GSL', 'Marlin' ] )
 
-ilcsoft.install( MarlinPKG( "LCFIPlus", LCFIPlus_version ))
-ilcsoft.module("LCFIPlus").download.type="GitHub"
-ilcsoft.module("LCFIPlus").download.gituser="lcfiplus"
-ilcsoft.module("LCFIPlus").download.gitrepo="LCFIPlus"
-ilcsoft.module("LCFIPlus").addDependency( [ 'LCIO', 'GEAR', 'ROOT', 'Marlin', 'MarlinUtil', 'LCFIVertex'] )
+ilcsoft.install( LCFIPlus(LCFIPlus_version) )
 
 ilcsoft.install( MarlinPKG( "ForwardTracking", ForwardTracking_version ))
 ilcsoft.module("ForwardTracking").addDependency( [ 'LCIO', 'GEAR', 'ROOT', 'GSL', 'Marlin', 'MarlinUtil', 'MarlinTrk'] )
@@ -229,11 +223,11 @@ ilcsoft.link( XercesC( ilcPath + "xercesc/" + XercesC_version ))
 
 # DD4hep
 ilcsoft.install( DD4hep( DD4hep_version )) 
-ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_GEANT4"]=1
-ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_LCIO"]=1
-ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_XERCESC"]=0
-ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_PYROOT"]=0
-ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_GEAR"]=1
+ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_GEANT4"]="ON"
+ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_LCIO"]="ON"
+ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_XERCESC"]="OFF"
+ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_PYROOT"]="OFF"
+ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_GEAR"]="ON"
 # ilcsoft.module("DD4hep").envcmake["BOOST_ROOT"] = Boost_path
 
 
@@ -322,7 +316,7 @@ ilcsoft.link( ROOT( ilcPath + "root/" + ROOT_version ))
 
 ilcsoft.link( CLHEP( ilcPath + "CLHEP/" + CLHEP_version ))
 ilcsoft.link( GSL( ilcPath + "gsl/" + GSL_version ))
-ilcsoft.link( Qt5( ilcPath + "Qt5/" + Qt5_version ))
+# ilcsoft.link( Qt5( ilcPath + "Qt5/" + Qt5_version ))
 ilcsoft.link( Geant4( ilcPath + "geant4/" + Geant4_version ))
 
 ilcsoft.link( CondDBMySQL( ilcPath + "CondDBMySQL/" + CondDBMySQL_version ))