Skip to content
Snippets Groups Projects
Commit d4b46804 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Updated all projects to atlasexternals-2.0.72.

At the same time, since the new tag uses LCG_97apython3_ATLAS_1 by default
for all LCG based projects, removed the overrides from the build_externals.sh
scripts of all projects for forcing the usage of LCG_97a_ATLAS_1.

Also updated the Athena configuration to use the TDAQ installations compatible
with Python 3 instead of Python 2.7, and removed the NumPy environment setup
from the project. Since with LCG_97a we don't need that anymore.
parent ac6c952e
No related branches found
No related tags found
No related merge requests found
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AnalysisBaseExternalsVersion = 2.0.71 AnalysisBaseExternalsVersion = 2.0.72
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AtlasExternalsVersion = 2.0.71 AtlasExternalsVersion = 2.0.72
...@@ -24,7 +24,7 @@ BUILDDIR="" ...@@ -24,7 +24,7 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo" BUILDTYPE="RelWithDebInfo"
FORCE="" FORCE=""
CI="" CI=""
EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1") EXTRACMAKE=()
while getopts ":t:b:x:fch" opt; do while getopts ":t:b:x:fch" opt; do
case $opt in case $opt in
t) t)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthGenerationExternalsVersion = 2.0.71 AthGenerationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004 GaudiVersion = v33r1.004
...@@ -24,7 +24,7 @@ BUILDDIR="" ...@@ -24,7 +24,7 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo" BUILDTYPE="RelWithDebInfo"
FORCE="" FORCE=""
CI="" CI=""
EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1") EXTRACMAKE=()
while getopts ":t:b:x:fch" opt; do while getopts ":t:b:x:fch" opt; do
case $opt in case $opt in
t) t)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthSimulationExternalsVersion = 2.0.71 AthSimulationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004 GaudiVersion = v33r1.004
...@@ -31,9 +31,9 @@ if( LCG_NIGHTLY ) ...@@ -31,9 +31,9 @@ if( LCG_NIGHTLY )
set( TDAQ_VERSION "99-00-00" CACHE STRING set( TDAQ_VERSION "99-00-00" CACHE STRING
"The version of tdaq to use for the build" ) "The version of tdaq to use for the build" )
else() else()
set( TDAQ-COMMON_VERSION "04-01-01" CACHE STRING set( TDAQ-COMMON_VERSION "04-01-00" CACHE STRING
"The version of tdaq-common to use for the build" ) "The version of tdaq-common to use for the build" )
set( TDAQ_VERSION "09-01-01" CACHE STRING set( TDAQ_VERSION "09-01-00" CACHE STRING
"The version of tdaq to use for the build" ) "The version of tdaq to use for the build" )
endif() endif()
...@@ -74,12 +74,6 @@ set( OpenBlasEnvironment_DIR "${CMAKE_SOURCE_DIR}/cmake" ...@@ -74,12 +74,6 @@ set( OpenBlasEnvironment_DIR "${CMAKE_SOURCE_DIR}/cmake"
mark_as_advanced( OpenBlasEnvironment_DIR ) mark_as_advanced( OpenBlasEnvironment_DIR )
find_package( OpenBlasEnvironment ) find_package( OpenBlasEnvironment )
# Set up the runtime environment for NumPy.
set( NumPyEnvironment_DIR "${CMAKE_SOURCE_DIR}/cmake"
CACHE PATH "Directory holding NumPyEnvironmentConfig.cmake" )
mark_as_advanced( NumPyEnvironment_DIR )
find_package( NumPyEnvironment )
# Set up where to find the AthenaPoolUtilitiesTest CMake code. # Set up where to find the AthenaPoolUtilitiesTest CMake code.
set( AthenaPoolUtilitiesTest_DIR set( AthenaPoolUtilitiesTest_DIR
"${CMAKE_SOURCE_DIR}/../../Database/AthenaPOOL/AthenaPoolUtilities/cmake" "${CMAKE_SOURCE_DIR}/../../Database/AthenaPOOL/AthenaPoolUtilities/cmake"
......
...@@ -24,7 +24,7 @@ BUILDDIR="" ...@@ -24,7 +24,7 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo" BUILDTYPE="RelWithDebInfo"
FORCE="" FORCE=""
CI="" CI=""
EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1") EXTRACMAKE=()
while getopts ":t:b:x:fch" opt; do while getopts ":t:b:x:fch" opt; do
case $opt in case $opt in
t) t)
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# Module for setting up the runtime environment for numpy from an LCG release.
#
# Decide whether or not to pass "QUIET" to the subsequent find_package call(s).
set( _quietFlag )
if( NumPyEnvironment_FIND_QUIETLY )
set( _quietFlag QUIET )
endif()
# Find the lapack installation that's part of LCG. Note that this call finds the
# CMake configuration included in the LAPACK installation, it does *not* use
# CMake's FindLAPACK.cmake module.
find_package( lapack ${_quietFlag} )
# Extract the path of the library pointed to by the "lapack" imported library.
if( lapack_FOUND )
get_target_property( _configs lapack IMPORTED_CONFIGURATIONS )
list( GET _configs 0 _config )
get_target_property( _libPath lapack IMPORTED_LOCATION_${_config} )
get_filename_component( NumPyEnvironment_LIBRARY_DIRS ${_libPath}
DIRECTORY )
unset( _configs )
unset( _config )
unset( _libPath )
endif()
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthenaExternalsVersion = 2.0.71 AthenaExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004 GaudiVersion = v33r1.004
...@@ -26,7 +26,7 @@ BUILDDIR="" ...@@ -26,7 +26,7 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo" BUILDTYPE="RelWithDebInfo"
FORCE="" FORCE=""
CI="" CI=""
EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1") EXTRACMAKE=()
while getopts ":t:b:fch" opt; do while getopts ":t:b:fch" opt; do
case $opt in case $opt in
t) t)
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
VP1LightExternalsVersion = 2.0.71 VP1LightExternalsVersion = 2.0.72
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment