From da7370de829f0b363ea8d813b17c4f9ba3b5280f Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 25 Sep 2024 13:33:04 +0200
Subject: [PATCH] Update to Gaudi v39r0
Update to Gaudi v39r0
---
.../share/LinearTransformTaskExample_jobOptions.py | 4 ++--
.../TrigControl/TrigServices/src/TrigMonTHistSvc.cxx | 8 +-------
.../TrigControl/TrigServices/src/TrigMonTHistSvc.h | 3 +--
Projects/AthAnalysis/build_externals.sh | 2 +-
Projects/AthGeneration/build_externals.sh | 2 +-
Projects/AthSimulation/build_externals.sh | 2 +-
Projects/Athena/build_externals.sh | 2 +-
7 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/Control/AthenaExamples/AthExCUDA/share/LinearTransformTaskExample_jobOptions.py b/Control/AthenaExamples/AthExCUDA/share/LinearTransformTaskExample_jobOptions.py
index 8b0b5177171..8bb080b2f5f 100644
--- a/Control/AthenaExamples/AthExCUDA/share/LinearTransformTaskExample_jobOptions.py
+++ b/Control/AthenaExamples/AthExCUDA/share/LinearTransformTaskExample_jobOptions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
# "Standalone" jobOptions for running
# AthCUDAExamples::LinearTransformTaskExampleAlg.
@@ -24,7 +24,7 @@ from AthExCUDA.AthExCUDAConf import \
AthCUDAExamples__LinearTransformTaskExampleAlg
algSequence += AthCUDAExamples__LinearTransformTaskExampleAlg(
KernelRunnerSvc = ServiceMgr.CUDAKernelRunnerSvc,
- Blocking = True )
+ Asynchronous = True )
# Run for some larger number of events.
theApp.EvtMax = 10000
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
index b2d73a4ecf0..6da4c094a4d 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigMonTHistSvc.h"
@@ -280,12 +280,6 @@ StatusCode TrigMonTHistSvc::regHist(const std::string& id, std::unique_ptr<TH1>
return regHist_i(std::move(hist), id, false, hid);
}
-StatusCode TrigMonTHistSvc::regHist(const std::string& id, std::unique_ptr<TH1> hist, TH1* /*hist_ptr*/)
-{
- THistID* hid = nullptr;
- return regHist_i(std::move(hist), id, false, hid);
-}
-
StatusCode TrigMonTHistSvc::regHist(const std::string& id, TH1* hist_ptr)
{
THistID* hid = nullptr;
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
index 5770b3c2b93..57bc45db0ba 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMONTHISTSVC_THISTSVC_H
@@ -51,7 +51,6 @@ public:
virtual StatusCode regHist(const std::string& name) override;
virtual StatusCode regHist(const std::string& name, std::unique_ptr<TH1> hist) override;
- virtual StatusCode regHist(const std::string& name, std::unique_ptr<TH1> hist, TH1* hist_ptr) override;
virtual StatusCode regHist(const std::string& name, TH1*) override;
virtual StatusCode getHist(const std::string& id, TH1*& hist, size_t ind) const override;
virtual StatusCode getHist(const std::string& id, TH2*& hist, size_t ind) const override;
diff --git a/Projects/AthAnalysis/build_externals.sh b/Projects/AthAnalysis/build_externals.sh
index 5aaa919f3db..26f35f977d7 100755
--- a/Projects/AthAnalysis/build_externals.sh
+++ b/Projects/AthAnalysis/build_externals.sh
@@ -12,7 +12,7 @@ ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
-DLCG_VERSION_POSTFIX="_ATLAS_11"
-DATLAS_ONNXRUNTIME_USE_CUDA=FALSE
- -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v38r3.000/Gaudi-v38r3.000.tar.gz;URL_MD5;a298a4ed0cc4029fb5c725adfb9d24ac")
+ -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r0.000/Gaudi-v39r0.000.tar.gz;URL_MD5;d6a88e827d52286bed248f7e4fba6b33")
ATLAS_EXTRA_MAKE_ARGS=()
# Let "the common script" do all the heavy lifting.
diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh
index e6e58500e10..3774a210de2 100755
--- a/Projects/AthGeneration/build_externals.sh
+++ b/Projects/AthGeneration/build_externals.sh
@@ -11,7 +11,7 @@ ATLAS_EXT_PROJECT_NAME="AthGenerationExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
-DLCG_VERSION_POSTFIX="_ATLAS_11"
- -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v38r3.000/Gaudi-v38r3.000.tar.gz;URL_MD5;a298a4ed0cc4029fb5c725adfb9d24ac"
+ -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r0.000/Gaudi-v39r0.000.tar.gz;URL_MD5;d6a88e827d52286bed248f7e4fba6b33"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.3.0/GeoModel-6.3.0.tar.bz2;URL_MD5;4e42239acfd362ac33b31a6d563c128e")
ATLAS_EXTRA_MAKE_ARGS=()
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index 36b35894c2e..7f72b967bb2 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -11,7 +11,7 @@ ATLAS_EXT_PROJECT_NAME="AthSimulationExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
-DLCG_VERSION_POSTFIX="_ATLAS_11"
- -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v38r3.000/Gaudi-v38r3.000.tar.gz;URL_MD5;a298a4ed0cc4029fb5c725adfb9d24ac"
+ -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r0.000/Gaudi-v39r0.000.tar.gz;URL_MD5;d6a88e827d52286bed248f7e4fba6b33"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.3.0/GeoModel-6.3.0.tar.bz2;URL_MD5;4e42239acfd362ac33b31a6d563c128e"
-DATLAS_GEANT4_USE_LTO=TRUE
-DATLAS_VECGEOM_USE_LTO=TRUE)
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index d1fe9b16753..39df2d54a9c 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -11,7 +11,7 @@ ATLAS_EXT_PROJECT_NAME="AthenaExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=106
-DLCG_VERSION_POSTFIX="_ATLAS_11"
- -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v38r3.000/Gaudi-v38r3.000.tar.gz;URL_MD5;a298a4ed0cc4029fb5c725adfb9d24ac"
+ -DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v39r0.000/Gaudi-v39r0.000.tar.gz;URL_MD5;d6a88e827d52286bed248f7e4fba6b33"
-DATLAS_ACTS_SOURCE="URL;https://github.com/acts-project/acts/archive/refs/tags/v36.3.1.tar.gz;URL_HASH;SHA256=3ca4d7c9170d11924c040a07728c565498382d2063356c10365777fbbb56c156"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.3.0/GeoModel-6.3.0.tar.bz2;URL_MD5;4e42239acfd362ac33b31a6d563c128e"
-DATLAS_VECMEM_SOURCE="URL;http://cern.ch/atlas-software-dist-eos/externals/vecmem/v1.5.0.tar.gz;https://github.com/acts-project/vecmem/archive/refs/tags/v1.5.0.tar.gz;URL_MD5;3cc5a3bb14b93f611513535173a6be28"
--
GitLab