Skip to content

Commit b80f811

Browse files
authored
Merge pull request #1162 from stephenswat/build/acts_43_4
Update ACTS dependency to v43.3
2 parents ed92914 + 97e2d7b commit b80f811

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

.github/workflows/builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
run: ${GITHUB_WORKSPACE}/.github/find_f64_ptx.py --source ${GITHUB_WORKSPACE} --build build $(find build -name "*.ptx")
130130

131131
macos:
132-
runs-on: macos-14
132+
runs-on: macos-15
133133
name: macOS-Release
134134
steps:
135135
- uses: actions/checkout@v4

core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ traccc_add_library( traccc_core core TYPE SHARED
134134
"src/ambiguity_resolution/legacy/greedy_ambiguity_resolution_algorithm.cpp")
135135
target_link_libraries( traccc_core
136136
PUBLIC Eigen3::Eigen vecmem::core covfie::core detray::core detray::detectors
137-
traccc::algebra ActsCore )
137+
traccc::algebra Acts::Core )
138138

139139
# Prevent Eigen from getting confused when building code for a
140140
# CUDA or HIP backend with SYCL.

extern/acts/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ include( FetchContent )
1212
message( STATUS "Building Acts as part of the TRACCC project" )
1313

1414
# Declare where to get Acts from.
15+
# HACK: Go back to using a real Acts release when a version after
16+
# v43.3.0 is released that incorporates Acts#4659
1517
set( TRACCC_ACTS_SOURCE
16-
"URL;https://github.com/acts-project/acts/archive/refs/tags/v39.0.0.tar.gz;URL_MD5;a50bf40cb5bc6b831d13ee1eb89b0c14"
18+
"GIT_REPOSITORY;https://github.com/acts-project/acts.git;GIT_TAG;dfa5b4fd97d1cf9674f3c580e5fc4cd7f0c4103f"
1719
CACHE STRING "Source for Acts, when built as part of this project" )
1820
mark_as_advanced( TRACCC_ACTS_SOURCE )
1921
FetchContent_Declare( Acts SYSTEM ${TRACCC_ACTS_SOURCE} )

io/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ traccc_add_library( traccc_io io TYPE SHARED
8080
"src/obj/write_track_candidates.cpp"
8181
)
8282
target_link_libraries( traccc_io
83-
PUBLIC vecmem::core traccc::core ActsCore dfelibs::dfelibs
84-
PRIVATE detray::core detray::io ActsPluginJson )
83+
PUBLIC vecmem::core traccc::core Acts::Core dfelibs::dfelibs
84+
PRIVATE detray::core detray::io Acts::PluginJson )
8585
target_compile_definitions( traccc_io
8686
PRIVATE TRACCC_TEST_DATA_DIR="${CMAKE_SOURCE_DIR}/data" )
8787
if( OpenMP_CXX_FOUND )

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ add_library( traccc_tests_common STATIC
2424
target_include_directories( traccc_tests_common
2525
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/common )
2626
target_link_libraries( traccc_tests_common
27-
PUBLIC dfelibs::dfelibs GTest::gtest ActsCore vecmem::core
27+
PUBLIC dfelibs::dfelibs GTest::gtest Acts::Core vecmem::core
2828
detray::core detray::io detray::test_common covfie::core traccc::core traccc::io traccc_simulation)
2929

3030
# Use ROOT in traccc_tests_common, if requested.

tests/cpu/compare_with_acts_seeding.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,10 @@ TEST_P(CompareWithActsSeedingTests, Run) {
387387
// EXPECT_EQ(seeds.size(), seedVector.size());
388388
EXPECT_NEAR(static_cast<double>(traccc_seeds.size()),
389389
static_cast<double>(n_matched_acts_seeds),
390-
static_cast<double>(traccc_seeds.size()) * 0.0023);
390+
static_cast<double>(traccc_seeds.size()) * 0.004);
391391
EXPECT_GT(static_cast<double>(n_matched_acts_seeds) /
392392
static_cast<double>(traccc_seeds.size()),
393-
0.9977);
393+
0.995);
394394
}
395395

396396
INSTANTIATE_TEST_SUITE_P(

0 commit comments

Comments
 (0)