From d4b468047c0e995ff86545ca1346d4abf1c8dc11 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Mon, 27 Jul 2020 11:06:49 +0200
Subject: [PATCH] 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.
---
Projects/AnalysisBase/externals.txt | 2 +-
Projects/AthDataQuality/externals.txt | 2 +-
Projects/AthGeneration/build_externals.sh | 2 +-
Projects/AthGeneration/externals.txt | 2 +-
Projects/AthSimulation/build_externals.sh | 2 +-
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/CMakeLists.txt | 10 ++-----
Projects/Athena/build_externals.sh | 2 +-
.../Athena/cmake/NumPyEnvironmentConfig.cmake | 27 -------------------
Projects/Athena/externals.txt | 2 +-
Projects/VP1Light/build_externals.sh | 2 +-
Projects/VP1Light/externals.txt | 2 +-
12 files changed, 12 insertions(+), 45 deletions(-)
delete mode 100644 Projects/Athena/cmake/NumPyEnvironmentConfig.cmake
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 9d67d068baf..f40c389b87c 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.71
+AnalysisBaseExternalsVersion = 2.0.72
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index 17c59acee12..3fb6232f033 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
-AtlasExternalsVersion = 2.0.71
+AtlasExternalsVersion = 2.0.72
diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh
index 26b6322843c..04f619e34bc 100755
--- a/Projects/AthGeneration/build_externals.sh
+++ b/Projects/AthGeneration/build_externals.sh
@@ -24,7 +24,7 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo"
FORCE=""
CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
+EXTRACMAKE=()
while getopts ":t:b:x:fch" opt; do
case $opt in
t)
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index a02976e05e5..a5b437a06ac 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.71
+AthGenerationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index 640a10702ac..0463ba13158 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -24,7 +24,7 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo"
FORCE=""
CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
+EXTRACMAKE=()
while getopts ":t:b:x:fch" opt; do
case $opt in
t)
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 8ffb68a0014..234b5a04b14 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.71
+AthSimulationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 2403fa9c719..7ac8b2dc026 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -31,9 +31,9 @@ if( LCG_NIGHTLY )
set( TDAQ_VERSION "99-00-00" CACHE STRING
"The version of tdaq to use for the build" )
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" )
- 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" )
endif()
@@ -74,12 +74,6 @@ set( OpenBlasEnvironment_DIR "${CMAKE_SOURCE_DIR}/cmake"
mark_as_advanced( OpenBlasEnvironment_DIR )
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( AthenaPoolUtilitiesTest_DIR
"${CMAKE_SOURCE_DIR}/../../Database/AthenaPOOL/AthenaPoolUtilities/cmake"
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index 6929a21c2e7..95720fa9c00 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -24,7 +24,7 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo"
FORCE=""
CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
+EXTRACMAKE=()
while getopts ":t:b:x:fch" opt; do
case $opt in
t)
diff --git a/Projects/Athena/cmake/NumPyEnvironmentConfig.cmake b/Projects/Athena/cmake/NumPyEnvironmentConfig.cmake
deleted file mode 100644
index 407af5d972f..00000000000
--- a/Projects/Athena/cmake/NumPyEnvironmentConfig.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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()
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index dc8b3c68f86..be57a7a38e6 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.71
+AthenaExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004
diff --git a/Projects/VP1Light/build_externals.sh b/Projects/VP1Light/build_externals.sh
index e2b5c3881f9..4b83f43b313 100755
--- a/Projects/VP1Light/build_externals.sh
+++ b/Projects/VP1Light/build_externals.sh
@@ -26,7 +26,7 @@ BUILDDIR=""
BUILDTYPE="RelWithDebInfo"
FORCE=""
CI=""
-EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="a_ATLAS_1")
+EXTRACMAKE=()
while getopts ":t:b:fch" opt; do
case $opt in
t)
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index 46aef434d6a..bb11012d898 100644
--- a/Projects/VP1Light/externals.txt
+++ b/Projects/VP1Light/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.71
+VP1LightExternalsVersion = 2.0.72
--
GitLab