From eeaa390c21fe33797a0a5bd6d4476cb0296b7645 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <Frank.Winklmeier@cern.ch>
Date: Fri, 13 Jan 2017 09:22:54 +0100
Subject: [PATCH] Add asetup_wrapper, gcc62 as default platform
(HLTUtils-01-04-00)
* Remove pt/athena_wrapper
* Add generic asetup_wrapper
* python/hltOksUtils.py: Update cmtconfig tag to gcc62
* HLTUtils-01-04-00
2016-11-17 Stewart Martin-Haugh <smh@cern.ch>
* share/make_hlt_env.py: Add cvmfs asetup location
* HLTUtils-01-03-09
---
HLT/HLTUtils/CMakeLists.txt | 10 ++-
HLT/HLTUtils/python/hltOksUtils.py | 6 +-
HLT/HLTUtils/share/asetup_wrapper | 115 +++++++++++++++++++++++++++++
HLT/HLTUtils/share/athena_wrapper | 79 --------------------
HLT/HLTUtils/share/make_hlt_env.py | 3 +-
HLT/HLTUtils/share/make_hlt_rep.py | 16 ++--
HLT/HLTUtils/share/pt_main_wrapper | 82 --------------------
7 files changed, 134 insertions(+), 177 deletions(-)
create mode 100755 HLT/HLTUtils/share/asetup_wrapper
delete mode 100755 HLT/HLTUtils/share/athena_wrapper
delete mode 100755 HLT/HLTUtils/share/pt_main_wrapper
diff --git a/HLT/HLTUtils/CMakeLists.txt b/HLT/HLTUtils/CMakeLists.txt
index b9d7748ae99..8e1298df4ac 100644
--- a/HLT/HLTUtils/CMakeLists.txt
+++ b/HLT/HLTUtils/CMakeLists.txt
@@ -7,5 +7,13 @@ atlas_subdir( HLTUtils )
# Install files from the package:
atlas_install_python_modules( python/*.py )
-atlas_install_scripts( share/hlt_relocate.sh share/hlt_postinstall.sh share/make_hlt_env.py share/make_hlt_rep.py share/make_coralServer_rep.py share/make_hlt_patch.py share/pt_main_wrapper share/athena_wrapper )
+atlas_install_scripts(
+ share/hlt_relocate.sh
+ share/hlt_postinstall.sh
+ share/make_hlt_env.py
+ share/make_hlt_rep.py
+ share/make_hlt_patch.py
+ share/make_coralServer_rep.py
+ share/asetup_wrapper
+ )
diff --git a/HLT/HLTUtils/python/hltOksUtils.py b/HLT/HLTUtils/python/hltOksUtils.py
index 01d63cf9c12..cc1152c365e 100644
--- a/HLT/HLTUtils/python/hltOksUtils.py
+++ b/HLT/HLTUtils/python/hltOksUtils.py
@@ -4,14 +4,12 @@
Utilities for HLT OKS file generation
"""
-import pm.common
-
def defaultTags():
"""Return list of supported CMTCONFIG tags"""
import pm.common
- tags = [pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc49-opt'),
- pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc49-dbg')]
+ tags = [pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc62-opt'),
+ pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc62-dbg')]
return tags
diff --git a/HLT/HLTUtils/share/asetup_wrapper b/HLT/HLTUtils/share/asetup_wrapper
new file mode 100755
index 00000000000..a3af5204c0f
--- /dev/null
+++ b/HLT/HLTUtils/share/asetup_wrapper
@@ -0,0 +1,115 @@
+#!/bin/bash
+#
+# Wrapper to provide asetup environemnt to any command
+#
+
+if [ $# -lt 1 -o "$1" == "-h" ]; then
+ echo 'Syntax: asetup_wrapper CMD [ARGS]'
+ echo 'Required environment: '
+ echo ' AtlasSetup : location of AtlasSetup installation'
+ echo ' ASETUP_ARGS : arguments passed to asetup'
+ echo 'Optional environment: '
+ echo ' ASETUP_PRELOAD : Value to set for LD_PRELOAD after asetup has been run'
+ exit 1
+fi
+
+cmd=$1
+shift
+args="$*"
+
+# Not provided by default in partition
+export PATH=${PATH}:/bin:/usr/bin
+
+if [ ! -z "${HLT_VERBOSE}" ]; then
+ echo "================================================================================"
+ echo "Environment delivered to asetup_wrapper script:"
+ printenv | sort
+ echo "================================================================================"
+fi
+
+set_coredump()
+{
+ # Set core dump limits if required and allowed
+ if [ ! -z "${HLT_COREDUMPSIZE}" ]
+ then
+ echo "Setting core dump limits to: ${HLT_COREDUMPSIZE}"
+ ulimit -c ${HLT_COREDUMPSIZE}
+ ulimit -a
+ fi
+}
+
+
+reverse_paths()
+{
+ result=""
+ for p in `echo ${1} | tr ':' ' '`
+ do
+ result="${p} ${result}"
+ done
+ echo $result
+}
+
+update_paths()
+{
+ if [ ! -z "${HLT_EXTRA_SW_PATH}" ]
+ then
+ for dir in `reverse_paths ${HLT_EXTRA_SW_PATH}`
+ do
+ if [ -d ${dir} ]
+ then
+ export PATH=${dir}/InstallArea/share/bin:${dir}/InstallArea/${CMTCONFIG}/bin:${PATH}
+ export LD_LIBRARY_PATH=${dir}/InstallArea/${CMTCONFIG}/lib:${LD_LIBRARY_PATH}
+ export PYTHONPATH=${dir}/InstallArea/python:${PYTHONPATH}
+ export JOBOPTSEARCHPATH=${dir}/InstallArea/jobOptions:${JOBOPTSEARCHPATH}
+ export DATAPATH=${dir}/InstallArea/share:${DATAPATH}
+ export CALIBPATH=${dir}/InstallArea/share:${CALIBPATH}
+ export XMLPATH=${dir}/InstallArea/XML:${XMLPATH}
+ else
+ echo "WARNING: directory ${dir} does not exist !"
+ fi
+ done
+ echo "PATH=`echo ${PATH} | tr ':' '\n'`"
+ echo "LD_LIBRARY_PATH=`echo ${LD_LIBRARY_PATH} | tr ':' '\n'`"
+ echo "PYTHONPATH=`echo ${PYTHONPATH} | tr ':' '\n'`"
+ echo "JOBOPTSEARCHPATH=`echo ${JOBOPTSEARCHPATH} | tr ':' '\n'`"
+ echo "DATAPATH=`echo ${DATAPATH} | tr ':' '\n'`"
+ echo "CALIBPATH=`echo ${CALIBPATH} | tr ':' '\n'`"
+ echo "XMLPATH=`echo ${XMLPATH} | tr ':' '\n'`"
+ fi
+}
+
+update_paths
+set_coredump
+
+if [ ! -e ${AtlasSetup}/scripts/asetup.sh ]; then
+ echo 'Cannot find asetup. Make sure $AtlasSetup is set correctly.'
+ exit 1
+fi
+
+if [ -z "${ASETUP_ARGS}" ]; then
+ echo 'No asetup tags given. Please set $ASETUP_ARGS.'
+ exit 1
+fi
+
+echo "asetup environment with tags: ${ASETUP_ARGS}"
+source ${AtlasSetup}/scripts/asetup.sh --input=None ${ASETUP_ARGS}
+
+if [ $? -ne 0 ]; then
+ exit $?
+fi
+
+if [ ! -z "${ASETUP_PRELOAD}" ]; then
+ export LD_PRELOAD=${ASETUP_PRELOAD}
+ echo "Setting LD_PRELOAD=${LD_PRELOAD}"
+fi
+
+if [ ! -z "${HLT_VERBOSE}" ]; then
+ echo "================================================================================"
+ echo "Environment before calling 'exec $cmd $args'"
+ printenv | sort
+ echo "================================================================================"
+fi
+
+echo "exec $cmd $args"
+exec $cmd $args
+
diff --git a/HLT/HLTUtils/share/athena_wrapper b/HLT/HLTUtils/share/athena_wrapper
deleted file mode 100755
index 84a3d1fd434..00000000000
--- a/HLT/HLTUtils/share/athena_wrapper
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-#
-
-args="$*"
-
-if [ ! -z "${HLT_VERBOSE}" ]; then
- echo "================================================================================"
- echo "Environment delivered to pt_main_wrapper script:"
- /usr/bin/printenv
- echo "================================================================================"
-fi
-
-#######################################################################
-# setup HLT
-#######################################################################
-echo "==============================================================="
-
-set_coredump()
-{
- # Set core dump limits if required and allowed
- if [ ! -z "${HLT_COREDUMPSIZE}" ]
- then
- echo "Setting core dump limits to: ${HLT_COREDUMPSIZE}"
- ulimit -c ${HLT_COREDUMPSIZE}
- ulimit -a
- fi
-}
-
-
-reverse_paths()
-{
- result=""
- for p in `echo ${1} | tr ':' ' '`
- do
- result="${p} ${result}"
- done
- echo $result
-}
-
-update_paths()
-{
- if [ ! -z "${HLT_EXTRA_SW_PATH}" ]
- then
- for dir in `reverse_paths ${HLT_EXTRA_SW_PATH}`
- do
- if [ -d ${dir} ]
- then
- PATH=${dir}/InstallArea/share/bin:${dir}/InstallArea/${CMTCONFIG}/bin:${PATH}
- LD_LIBRARY_PATH=${dir}/InstallArea/${CMTCONFIG}/lib:${LD_LIBRARY_PATH}
- PYTHONPATH=${dir}/InstallArea/python:${PYTHONPATH}
- JOBOPTSEARCHPATH=${dir}/InstallArea/jobOptions:${JOBOPTSEARCHPATH}
- DATAPATH=${dir}/InstallArea/share:${DATAPATH}
- XMLPATH=${dir}/InstallArea/XML:${XMLPATH}
- ROOTMAPSEARCHPATH=${dir}/InstallArea/rootmap:${ROOTMAPSEARCHPATH}
- else
- echo "WARNING: directory ${dir} does not exist !"
- fi
- done
- echo "PATH=`echo ${PATH} | tr ':' '\n'`"
- echo "LD_LIBRARY_PATH=`echo ${LD_LIBRARY_PATH} | tr ':' '\n'`"
- echo "PYTHONPATH=`echo ${PYTHONPATH} | tr ':' '\n'`"
- echo "JOBOPTSEARCHPATH=`echo ${JOBOPTSEARCHPATH} | tr ':' '\n'`"
- echo "DATAPATH=`echo ${DATAPATH} | tr ':' '\n'`"
- echo "XMLPATH=`echo ${XMLPATH} | tr ':' '\n'`"
- fi
-}
-
-update_paths
-set_coredump
-
-if [ ! -z "${HLT_VERBOSE}" ]; then
- echo "================================================================================"
- echo "Environment before executing exec pt_main $args"
- printenv | sort
- echo "================================================================================"
-fi
-
-exec athena.py $args
-
diff --git a/HLT/HLTUtils/share/make_hlt_env.py b/HLT/HLTUtils/share/make_hlt_env.py
index 7f37f977f50..7c2bb5b165a 100755
--- a/HLT/HLTUtils/share/make_hlt_env.py
+++ b/HLT/HLTUtils/share/make_hlt_env.py
@@ -31,7 +31,8 @@ opt = None
class Config:
# Possible locations for AtlasSetup
- atlasSetupHome = ['/afs/cern.ch/atlas/software/dist/AtlasSetup',
+ atlasSetupHome = ['/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase/x86_64/AtlasSetup/current/AtlasSetup',
+ '/afs/cern.ch/atlas/software/dist/AtlasSetup',
'/sw/atlas/AtlasSetup', # Point1
os.environ.get('AtlasSetup',None)
]
diff --git a/HLT/HLTUtils/share/make_hlt_rep.py b/HLT/HLTUtils/share/make_hlt_rep.py
index 3cba5620b62..0faa0b1821d 100755
--- a/HLT/HLTUtils/share/make_hlt_rep.py
+++ b/HLT/HLTUtils/share/make_hlt_rep.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
-import os
-import sys
import optparse
import pm.project
@@ -23,10 +21,10 @@ parser.add_option("-m", "--modifier", action="store",
(opt, args) = parser.parse_args()
-if opt.prefix!=None:
+if opt.prefix is not None:
prefix = opt.prefix
-if opt.modifier!=None and len(opt.modifier)>0:
+if opt.modifier is not None and len(opt.modifier)>0:
modifier = '_' + opt.modifier
rep = pm.project.Project('daq/sw/repository.data.xml')
@@ -34,11 +32,9 @@ onlineRep = rep.getObject('SW_Repository', 'Online')
hlt_env = pm.project.Project('daq/segments/%s-Environment.data.xml' % prefix)
apps = [
- dal.Script('athena_wrapper%s' % modifier,
- BinaryName='athena_wrapper',
- Description='athena.py wrapper',
- ProcessEnvironment=[hlt_env.getObject('VariableSet', '%s-Environment' % prefix)],
- Authors=['Reiner.Hauser@cern.ch']
+ dal.Script('asetup_wrapper%s' % modifier,
+ BinaryName='asetup_wrapper',
+ Description='Provide asetup environment to any command'
)
]
@@ -58,7 +54,7 @@ vars = [
dal.SW_PackageVariable('PYTHONPATH%s' % modifier,
Name='PYTHONPATH',
Suffix="python")
- ]
+]
try:
diff --git a/HLT/HLTUtils/share/pt_main_wrapper b/HLT/HLTUtils/share/pt_main_wrapper
deleted file mode 100755
index 238a0424c9d..00000000000
--- a/HLT/HLTUtils/share/pt_main_wrapper
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-#
-
-args="$*"
-
-if [ ! -z "${HLT_VERBOSE}" ]; then
- echo "================================================================================"
- echo "Environment delivered to pt_main_wrapper script:"
- /usr/bin/printenv
- echo "================================================================================"
-fi
-
-#######################################################################
-# setup HLT
-#######################################################################
-echo "==============================================================="
-
-set_coredump()
-{
- # Set core dump limits if required and allowed
- if [ ! -z "${HLT_COREDUMPSIZE}" ]
- then
- echo "Setting core dump limits to: ${HLT_COREDUMPSIZE}"
- ulimit -c ${HLT_COREDUMPSIZE}
- ulimit -a
- fi
-}
-
-
-reverse_paths()
-{
- result=""
- for p in `echo ${1} | tr ':' ' '`
- do
- result="${p} ${result}"
- done
- echo $result
-}
-
-update_paths()
-{
- if [ ! -z "${HLT_EXTRA_SW_PATH}" ]
- then
- for dir in `reverse_paths ${HLT_EXTRA_SW_PATH}`
- do
- if [ -d ${dir} ]
- then
- PATH=${dir}/InstallArea/share/bin:${dir}/InstallArea/${CMTCONFIG}/bin:${PATH}
- LD_LIBRARY_PATH=${dir}/InstallArea/${CMTCONFIG}/lib:${LD_LIBRARY_PATH}
- PYTHONPATH=${dir}/InstallArea/python:${PYTHONPATH}
- JOBOPTSEARCHPATH=${dir}/InstallArea/jobOptions:${JOBOPTSEARCHPATH}
- DATAPATH=${dir}/InstallArea/share:${DATAPATH}
- XMLPATH=${dir}/InstallArea/XML:${XMLPATH}
- ROOTMAPSEARCHPATH=${dir}/InstallArea/rootmap:${ROOTMAPSEARCHPATH}
- else
- echo "WARNING: directory ${dir} does not exist !"
- fi
- done
- echo "PATH=`echo ${PATH} | tr ':' '\n'`"
- echo "LD_LIBRARY_PATH=`echo ${LD_LIBRARY_PATH} | tr ':' '\n'`"
- echo "PYTHONPATH=`echo ${PYTHONPATH} | tr ':' '\n'`"
- echo "JOBOPTSEARCHPATH=`echo ${JOBOPTSEARCHPATH} | tr ':' '\n'`"
- echo "DATAPATH=`echo ${DATAPATH} | tr ':' '\n'`"
- echo "XMLPATH=`echo ${XMLPATH} | tr ':' '\n'`"
- fi
-}
-
-update_paths
-set_coredump
-
-if [ ! -z "${HLT_VERBOSE}" ]; then
- echo "================================================================================"
- echo "Environment before executing exec pt_main $args"
- printenv | sort
- echo "================================================================================"
-fi
-
-if [ ! -z "${HLT_PRELOAD}" ]; then
- export LD_PRELOAD="${HLT_PRELOAD}"
-fi
-exec pt_main $args
-
--
GitLab