diff --git a/acts.spec b/acts.spec
index a8c714874b1..39696851b2d 100644
--- a/acts.spec
+++ b/acts.spec
@@ -1,4 +1,5 @@
### RPM external acts v44.0.1
+## INITENV +PATH PYTHON3PATH %{i}/python
## INCLUDE microarch_flags
## INCLUDE cuda-flags
## INCLUDE rocm-flags
@@ -10,27 +11,33 @@
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Source99: scram-tools.file/tools/eigen/env
-# Do not build the Acts and Traccc tests
-%define build_test 0
+# Build the Acts and Traccc tests
+%define build_test 1
BuildRequires: cmake
+BuildRequires: gmake
Requires: boost
-Requires: bz2lib
Requires: dd4hep
Requires: eigen
Requires: expat
+Requires: fastjet
Requires: geant4
Requires: json
Requires: python3
+Requires: py3-pybind11
Requires: root
Requires: xerces-c
-Requires: zlib
%{!?without_cuda:Requires: cuda}
%{!?without_rocm:Requires: rocm}
%if %{build_test}
# These are ony used to build the examples and unit tests
Requires: hepmc3
Requires: tbb
+# These are used through hepmc3, and need to be available to CMake
+Requires: bz2lib
+Requires: zlib
+Requires: zstd
+Requires: xz
%endif
%prep
@@ -63,7 +70,7 @@ cmake ../%{n}-%{realversion} \
-DCMAKE_SKIP_INSTALL_RPATH="ON" \
%if 0%{!?without_cuda:1}
-DCMAKE_CUDA_ARCHITECTURES="$(echo %{cuda_arch} | sed -e 's/ \+/;/g')" \
- -DCMAKE_CUDA_FLAGS="-Wno-deprecated-gpu-targets --threads 0" \
+ -DCMAKE_CUDA_FLAGS="-Wno-deprecated-gpu-targets" \
%endif
%if 0%{!?without_rocm:1}
-DCMAKE_HIP_ARCHITECTURES="$(echo %{rocm_archs} | sed -e 's/ \+/;/g')" \
@@ -72,13 +79,16 @@ cmake ../%{n}-%{realversion} \
-DBUILD_SHARED_LIBS="ON" \
-DACTS_NLOHMANNJSON_SOURCE="" \
-DACTS_USE_SYSTEM_NLOHMANN_JSON="ON" \
+ -DACTS_USE_SYSTEM_PYBIND11="ON" \
-DACTS_BUILD_PLUGIN_ACTSVG="ON" \
+ -DACTS_BUILD_PLUGIN_FASTJET="ON" \
-DACTS_BUILD_PLUGIN_JSON="ON" \
-DACTS_BUILD_PLUGIN_ROOT="ON" \
-DACTS_BUILD_PLUGIN_DD4HEP="ON" \
-DACTS_BUILD_PLUGIN_GEANT4="ON" \
-DACTS_BUILD_PLUGIN_TRACCC="ON" \
-DACTS_ENABLE_LOG_FAILURE_THRESHOLD="ON" \
+ -DACTSVG_USE_SYSTEM_PYBIND11="ON" \
-DCOVFIE_PLATFORM_CPU="ON" \
-DCOVFIE_PLATFORM_CUDA="%{cuda_enabled}" \
-DCOVFIE_PLATFORM_HIP="%{rocm_enabled}" \
@@ -110,12 +120,6 @@ make %{makeprocesses} VERBOSE=1
cd ../build
make install VERBOSE=1
-%if %{build_test}
-# download the traccc test data file to the .../data directory
-mkdir -p %{i}/data
-./_deps/traccc-src/data/traccc_data_get_files.sh -o %{i}/data
-%endif
-
# remove the scripts used to set the Acts environment variables
rm %{i}/bin/this_acts.sh
rm %{i}/bin/this_acts_withdeps.sh
diff --git a/actsdata.spec b/actsdata.spec
new file mode 100644
index 00000000000..f3ee1a3afb1
--- /dev/null
+++ b/actsdata.spec
@@ -0,0 +1,23 @@
+### RPM external actsdata v10
+## NOCOMPILER
+
+%define archive traccc-data-%{realversion}.tar.gz
+Source: https://acts.web.cern.ch/traccc/data/%{archive}
+
+%prep
+
+%build
+
+%install
+cp %{SOURCE0} %{i}/%{archive}
+
+%post
+LOCAL_PKG=${RPM_INSTALL_PREFIX}/%{pkgrel}
+SHARE_PKG=${RPM_INSTALL_PREFIX}/share/%{pkgcategory}/%{n}/%{realversion}
+if ! [ -d ${SHARE_PKG} ]; then
+ mkdir -p ${SHARE_PKG}
+ tar xvzf ${LOCAL_PKG}/%{archive} -C ${SHARE_PKG}
+fi
+rm -f ${LOCAL_PKG}/%{archive}
+cd ${LOCAL_PKG}/
+ln -s ../../../../share/%{pkgcategory}/%{n}/%{realversion}/* .
diff --git a/cmssw-tools.spec b/cmssw-tools.spec
index d0241192e1a..87fd0bed258 100644
--- a/cmssw-tools.spec
+++ b/cmssw-tools.spec
@@ -10,6 +10,7 @@ Requires: TOPO
Requires: CICADA
Requires: OpenBLAS
Requires: acts
+Requires: actsdata
%if %{enable_vecgeom}
Requires: celeritas
%endif
diff --git a/scram-tools.file/tools/acts/acts-fastjet.xml b/scram-tools.file/tools/acts/acts-fastjet.xml
new file mode 100644
index 00000000000..2d96978fe07
--- /dev/null
+++ b/scram-tools.file/tools/acts/acts-fastjet.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/scram-tools.file/tools/actsdata/actsdata.xml b/scram-tools.file/tools/actsdata/actsdata.xml
new file mode 100644
index 00000000000..83240a4a9ef
--- /dev/null
+++ b/scram-tools.file/tools/actsdata/actsdata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+