Skip to content

bump ACTS to 47.2.0 #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomeichlersmith wants to merge 3 commits into
base: main
Choose a base branch
from
Open

bump ACTS to 47.2.0 #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44a11c4
bump ACTS to 47.2.0
tomeichlersmith Aug 3, 2026
9232c6e
force old ACTS by removing find_package call in old versions
tomeichlersmith Aug 21, 2026
43a6ee0
include Eigen3 target when building tracking
tomeichlersmith Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ RUN install-ubuntu-packages \
###############################################################################
# Acts
###############################################################################
ENV ACTS_VERSION="36.0.0"
ENV ACTS_VERSION="47.2.0"
LABEL acts.version=${ACTS_VERSION}
RUN mkdir -p src &&\
${__wget} https://github.com/acts-project/acts/archive/refs/tags/v${ACTS_VERSION}.tar.gz |\
Expand Down
1 change: 0 additions & 1 deletion ci/interop/v4.2.14.patch
View file
Open in desktop

This file was deleted.

111 changes: 111 additions & 0 deletions ci/interop/v4.2.14.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
diff --git i/Conditions/include/Conditions/SimpleTableCondition.h w/Conditions/include/Conditions/SimpleTableCondition.h
index d34d930d..b69f81c7 100644
--- i/Conditions/include/Conditions/SimpleTableCondition.h
+++ w/Conditions/include/Conditions/SimpleTableCondition.h
@@ -8,6 +8,7 @@

#include <ostream>
#include <vector>
+#include <cstdint>

#include "Framework/ConditionsObject.h"
#include "Framework/Exception/Exception.h"
diff --git i/DetDescr/CMakeLists.txt w/DetDescr/CMakeLists.txt
index 753eb497..238529bd 100644
--- i/DetDescr/CMakeLists.txt
+++ w/DetDescr/CMakeLists.txt
@@ -16,32 +16,27 @@ setup_test(dependencies DetDescr::DetDescr)

option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
if(BUILD_DETECTORID_BINDINGS)
+ cmake_policy(SET CMP0167 NEW)
find_package(Python COMPONENTS Development)

- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
# libboost_python3 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
- endif()
-
- # libboost_python style libraries
- if (NOT Boost_FOUND)
- message("Looking for libboost_python")
- find_package(Boost QUIET COMPONENTS system thread python)
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
endif()

# libboost_python-py36 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
endif()

# libboost_python3-py36 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
endif()

# Nothing worked
diff --git i/Framework/CMakeLists.txt w/Framework/CMakeLists.txt
index 3da4a2a0..28bf843f 100644
--- i/Framework/CMakeLists.txt
+++ w/Framework/CMakeLists.txt
@@ -23,11 +23,11 @@ setup_library(module Framework name Configure interface)
# Search for the Python3 library
find_package(Python3 COMPONENTS Interpreter Development)

+cmake_policy(SET CMP0167 NEW)
# Search for Boost
find_package(
Boost REQUIRED
- COMPONENTS system
- log
+ COMPONENTS log
filesystem
thread
chrono
diff --git i/Hcal/src/Hcal/HcalClusterProducer.cxx w/Hcal/src/Hcal/HcalClusterProducer.cxx
index 7c976f4f..01804ea7 100644
--- i/Hcal/src/Hcal/HcalClusterProducer.cxx
+++ w/Hcal/src/Hcal/HcalClusterProducer.cxx
@@ -2,6 +2,7 @@

#include <exception>
#include <iostream>
+#include <list>

#include "Hcal/MyClusterWeight.h"
#include "Hcal/TemplatedClusterFinder.h"
diff --git i/Tracking/CMakeLists.txt w/Tracking/CMakeLists.txt
index 11a45e73..6e7a5d7b 100644
--- i/Tracking/CMakeLists.txt
+++ w/Tracking/CMakeLists.txt
@@ -75,6 +75,7 @@ setup_library(module Tracking
dependencies Framework::Configure
Framework::Framework
ActsCore
+ Eigen3::Eigen
Geant4::Interface
ROOT::Physics
Tracking::Event
diff --git i/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx w/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx
index 140011d9..0e07b681 100644
--- i/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx
+++ w/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx
@@ -1,5 +1,6 @@
#include <stdio.h>

+#include <array>
#include <iostream>

#include "TrigScint/Firmware/clusterproducer.h"
169 changes: 96 additions & 73 deletions ci/interop/v4.2.20.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,96 @@
diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
--- a/DetDescr/CMakeLists.txt
+++ b/DetDescr/CMakeLists.txt
@@ -17,32 +17,27 @@
option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
if(BUILD_DETECTORID_BINDINGS)
+ cmake_policy(SET CMP0167 NEW)
find_package(Python COMPONENTS Development)

- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
# libboost_python3 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
endif()

- # libboost_python style libraries
- if (NOT Boost_FOUND)
- message("Looking for libboost_python")
- find_package(Boost QUIET COMPONENTS system thread python)
- endif()
-
# libboost_python-py36 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
endif()

# libboost_python3-py36 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
endif()

# Nothing worked
if (NOT Boost_FOUND)
diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
--- a/Framework/CMakeLists.txt
+++ b/Framework/CMakeLists.txt
@@ -23,11 +23,11 @@
# Search for the Python3 library
find_package(Python3 COMPONENTS Interpreter Development)

+cmake_policy(SET CMP0167 NEW)
# Search for Boost
find_package(
Boost REQUIRED
- COMPONENTS system
- log
+ COMPONENTS log
filesystem
thread
chrono
diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx
--- a/Hcal/src/Hcal/HcalClusterProducer.cxx
+++ b/Hcal/src/Hcal/HcalClusterProducer.cxx
@@ -2,6 +2,7 @@

#include <exception>
#include <iostream>
+#include <list>

#include "Hcal/MyClusterWeight.h"
#include "Hcal/TemplatedClusterFinder.h"
diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
index 753eb497..238529bd 100644
--- a/DetDescr/CMakeLists.txt
+++ b/DetDescr/CMakeLists.txt
@@ -16,32 +16,27 @@ setup_test(dependencies DetDescr::DetDescr)

option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
if(BUILD_DETECTORID_BINDINGS)
+ cmake_policy(SET CMP0167 NEW)
find_package(Python COMPONENTS Development)

- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
# libboost_python3 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
- endif()
-
- # libboost_python style libraries
- if (NOT Boost_FOUND)
- message("Looking for libboost_python")
- find_package(Boost QUIET COMPONENTS system thread python)
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
endif()

# libboost_python-py36 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
endif()

# libboost_python3-py36 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
endif()

# Nothing worked
diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
index 8627fad6..8bbb2843 100644
--- a/Framework/CMakeLists.txt
+++ b/Framework/CMakeLists.txt
@@ -23,11 +23,11 @@ setup_library(module Framework name Configure dependencies Python3::Python)
# Search for the Python3 library
find_package(Python3 COMPONENTS Interpreter Development)

+cmake_policy(SET CMP0167 NEW)
# Search for Boost
find_package(
Boost REQUIRED
- COMPONENTS system
- log
+ COMPONENTS log
filesystem
thread
chrono
diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx
index 7c976f4f..01804ea7 100644
--- a/Hcal/src/Hcal/HcalClusterProducer.cxx
+++ b/Hcal/src/Hcal/HcalClusterProducer.cxx
@@ -2,6 +2,7 @@

#include <exception>
#include <iostream>
+#include <list>

#include "Hcal/MyClusterWeight.h"
#include "Hcal/TemplatedClusterFinder.h"
diff --git a/Tracking/CMakeLists.txt b/Tracking/CMakeLists.txt
index 2f3b4163..24e7d050 100644
--- a/Tracking/CMakeLists.txt
+++ b/Tracking/CMakeLists.txt
@@ -62,7 +62,6 @@ find_package(Eigen3 CONFIG REQUIRED)
# if you want to try an alternate Acts, you can
# 1. comment out the stuff here and replace with add_subdirectory(acts)
# 2. git clone acts into this directory and choose your version
-find_package(Acts QUIET)
if (NOT Acts_FOUND)
message(STATUS "Did not find Acts, downloading and compiling it here")
include(FetchContent)
@@ -94,6 +93,7 @@ setup_library(module Tracking
dependencies Framework::Configure 
Framework::Framework 
ActsCore
+ Eigen3::Eigen
Geant4::Interface
ROOT::Physics
Tracking::Event
1 change: 0 additions & 1 deletion ci/interop/v4.3.3.patch
View file
Open in desktop

This file was deleted.

88 changes: 88 additions & 0 deletions ci/interop/v4.3.3.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
diff --git i/DetDescr/CMakeLists.txt w/DetDescr/CMakeLists.txt
index 753eb497..238529bd 100644
--- i/DetDescr/CMakeLists.txt
+++ w/DetDescr/CMakeLists.txt
@@ -16,32 +16,27 @@ setup_test(dependencies DetDescr::DetDescr)

option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
if(BUILD_DETECTORID_BINDINGS)
+ cmake_policy(SET CMP0167 NEW)
find_package(Python COMPONENTS Development)

- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
# libboost_python3 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
- endif()
-
- # libboost_python style libraries
- if (NOT Boost_FOUND)
- message("Looking for libboost_python")
- find_package(Boost QUIET COMPONENTS system thread python)
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
endif()

# libboost_python-py36 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
endif()

# libboost_python3-py36 style libraries
if (NOT Boost_FOUND)
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
endif()

# Nothing worked
diff --git i/Framework/CMakeLists.txt w/Framework/CMakeLists.txt
index 8627fad6..8bbb2843 100644
--- i/Framework/CMakeLists.txt
+++ w/Framework/CMakeLists.txt
@@ -23,11 +23,11 @@ setup_library(module Framework name Configure dependencies Python3::Python)
# Search for the Python3 library
find_package(Python3 COMPONENTS Interpreter Development)

+cmake_policy(SET CMP0167 NEW)
# Search for Boost
find_package(
Boost REQUIRED
- COMPONENTS system
- log
+ COMPONENTS log
filesystem
thread
chrono
diff --git i/Hcal/src/Hcal/HcalClusterProducer.cxx w/Hcal/src/Hcal/HcalClusterProducer.cxx
index 9cf5ef21..c663982f 100644
--- i/Hcal/src/Hcal/HcalClusterProducer.cxx
+++ w/Hcal/src/Hcal/HcalClusterProducer.cxx
@@ -2,6 +2,7 @@

#include <exception>
#include <iostream>
+#include <list>

#include "Hcal/MyClusterWeight.h"
#include "Hcal/TemplatedClusterFinder.h"
diff --git i/Tracking/CMakeLists.txt w/Tracking/CMakeLists.txt
index 47671220..ae443194 100644
--- i/Tracking/CMakeLists.txt
+++ w/Tracking/CMakeLists.txt
@@ -62,7 +62,6 @@ find_package(Eigen3 CONFIG REQUIRED)
# if you want to try an alternate Acts, you can
# 1. comment out the stuff here and replace with add_subdirectory(acts)
# 2. git clone acts into this directory and choose your version
-find_package(Acts QUIET)
if (NOT Acts_FOUND)
message(STATUS "Did not find Acts, downloading and compiling it here")
include(FetchContent)
2 changes: 1 addition & 1 deletion ci/interop/v4.4.14.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v4.2.20.patch
v4.3.3.patch
2 changes: 1 addition & 1 deletion ci/interop/v4.4.7.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v4.2.20.patch
v4.3.3.patch
Loading