Skip to content

Commit 3b3f425

Browse files
committed
Simplify dependency structure
This commit significantly simplifies the dependency structure by removing the backends for vecmem and smatrix, as well as frontends which combine non-matching frontends and backends. This is functionality we never ever use and it is simply complicating this repository.
1 parent 75a1bdf commit 3b3f425

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+235
-2696
lines changed

CMakeLists.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,10 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY
4242
# Flags controlling how the Algebra Plugins code should behave.
4343
option( ALGEBRA_PLUGINS_INCLUDE_EIGEN
4444
"Include Eigen types in Algebra Plugins" FALSE )
45-
option( ALGEBRA_PLUGINS_INCLUDE_SMATRIX
46-
"Include Smatrix types in Algebra Plugins" FALSE )
4745
option( ALGEBRA_PLUGINS_INCLUDE_VC
4846
"Include Vc types in Algebra Plugins" FALSE )
4947
option( ALGEBRA_PLUGINS_INCLUDE_FASTOR
5048
"Include Fastor types in Algebra Plugins" FALSE )
51-
option( ALGEBRA_PLUGINS_INCLUDE_VECMEM
52-
"Include VecMem types in Algebra Plugins" FALSE )
5349
option( ALGEBRA_PLUGINS_BUILD_TESTING "Build the unit tests of Algebra Plugins"
5450
TRUE )
5551
option( ALGEBRA_PLUGINS_BUILD_BENCHMARKS "Build the benchmark suite of Algebra Plugins"
@@ -68,22 +64,6 @@ if( NOT DEFINED CMAKE_SUPPRESS_DEVELOPER_WARNINGS )
6864
set( _unsetDevWarningFlag TRUE )
6965
endif()
7066

71-
# Set up VecMem.
72-
option( ALGEBRA_PLUGINS_SETUP_VECMEM
73-
"Set up the VecMem target(s) explicitly" TRUE )
74-
option( ALGEBRA_PLUGINS_USE_SYSTEM_VECMEM
75-
"Pick up an existing installation of VecMem from the build environment"
76-
${ALGEBRA_PLUGINS_USE_SYSTEM_LIBS} )
77-
if( ALGEBRA_PLUGINS_SETUP_VECMEM )
78-
if( ALGEBRA_PLUGINS_USE_SYSTEM_VECMEM )
79-
find_package( vecmem 0.7.0 REQUIRED COMPONENTS LANGUAGE )
80-
else()
81-
add_subdirectory( extern/vecmem )
82-
# Make the "VecMem language code" available for the whole project.
83-
include( "${VECMEM_LANGUAGE_DIR}/vecmem-check-language.cmake" )
84-
endif()
85-
endif()
86-
8767
# Set up GoogleTest.
8868
option( ALGEBRA_PLUGINS_SETUP_GOOGLETEST
8969
"Set up the GoogleTest target(s) explicitly" TRUE )

CMakePresets.json

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@
1515
"ALGEBRA_PLUGINS_USE_SYSTEM_LIBS" : "FALSE"
1616
}
1717
},
18-
{
19-
"name" : "vecmem",
20-
"displayName" : "VecMem Enabled Configuration",
21-
"inherits" : [ "base" ],
22-
"cacheVariables": {
23-
"ALGEBRA_PLUGINS_SETUP_VECMEM" : "TRUE",
24-
"ALGEBRA_PLUGINS_INCLUDE_VECMEM" : "TRUE"
25-
}
26-
},
2718
{
2819
"name" : "eigen",
2920
"displayName" : "Eigen Enabled Configuration",
@@ -54,28 +45,27 @@
5445
{
5546
"name" : "default-x86-64",
5647
"displayName" : "Default Developer Configuration for x86_64",
57-
"inherits" : [ "vecmem", "eigen", "vc", "fastor" ]
48+
"inherits" : [ "eigen", "vc", "fastor" ]
5849
},
5950
{
6051
"name" : "default-aarch64",
6152
"displayName" : "Default Developer Configuration for ARM64",
62-
"inherits" : [ "vecmem", "eigen", "vc" ]
53+
"inherits" : [ "eigen", "vc" ]
6354
},
6455
{
6556
"name" : "cuda",
6657
"displayName" : "CUDA Developer Configuration",
67-
"inherits" : [ "vecmem", "eigen" ],
58+
"inherits" : [ "eigen" ],
6859
"cacheVariables" : {
6960
"ALGEBRA_PLUGINS_TEST_CUDA" : "TRUE"
7061
}
7162
},
7263
{
7364
"name" : "sycl",
7465
"displayName" : "SYCL Developer Configuration",
75-
"inherits" : [ "vecmem", "eigen" ],
66+
"inherits" : [ "eigen" ],
7667
"cacheVariables" : {
77-
"ALGEBRA_PLUGINS_TEST_SYCL" : "TRUE",
78-
"VECMEM_BUILD_SYCL_LIBRARY" : "TRUE"
68+
"ALGEBRA_PLUGINS_TEST_SYCL" : "TRUE"
7969
}
8070
}
8171
]

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ for the R&D projects [detray](https://github.com/acts-project/detray) and
88
| ------------------------------------------------------------------------- | --- | ---- | ---- |
99
| generic ||||
1010
| [Eigen](https://eigen.tuxfamily.org) ||||
11-
| [SMatrix](https://root.cern.ch/doc/master/group__SMatrixGroup.html) ||||
1211
| [VC](https://github.com/VcDevel/Vc) ||||
1312
| [Fastor](https://github.com/romeric/Fastor) ||||
1413

@@ -28,18 +27,13 @@ Available options:
2827
the following plugins:
2928
* `EIGEN`: Plugin using [Eigen](https://eigen.tuxfamily.org)
3029
(`OFF` by default)
31-
* `SMATRIX`: Plugin using
32-
[SMatrix](https://root.cern/doc/master/group__SMatrixGroup.html)
33-
(`OFF` by default)
3430
* `VC`: Plugin using [Vc](https://github.com/VcDevel/Vc)
3531
(`OFF` by default)
3632
* `FASTOR`: Plugin using [Fastor](https://github.com/romeric/Fastor)
3733
(`OFF` by default)
38-
* `VECMEM`: Plugin using [VecMem](https://github.com/acts-project/vecmem)
39-
(`OFF` by default)
4034
- `ALGEBRA_PLUGINS_USE_SYSTEM_LIBS`: Boolean configuring whether to search for all external libraries "on the system" or not
4135
- `ALGEBRA_PLUGINS_SETUP_<XXX>`: Boolean to turn on/off the explicit "setup" of
42-
the external libraries (`GOOGLETEST`, [`BENCHMARK`](https://github.com/google/benchmark), `EIGEN3`, `VC`, `FASTOR`, and `VECMEM`)
36+
the external libraries (`GOOGLETEST`, [`BENCHMARK`](https://github.com/google/benchmark), `EIGEN3`, `VC`, `FASTOR`)
4337
- `ALGEBRA_PLUGINS_USE_SYSTEM_<XXX>`: Boolean configuring how to set up a given
4438
external library
4539
* `ON`: The external library is searched for "on the system" using

cmake/algebra-plugins-compiler-options-sycl.cmake

Lines changed: 0 additions & 29 deletions
This file was deleted.

cmake/algebra-plugins-config.cmake.in

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
# Set up variables describing which plugins were enabled during the Algebra
1111
# Plugins build.
1212
set( ALGEBRA_PLUGINS_INCLUDE_EIGEN @ALGEBRA_PLUGINS_INCLUDE_EIGEN@ )
13-
set( ALGEBRA_PLUGINS_INCLUDE_SMATRIX @ALGEBRA_PLUGINS_INCLUDE_SMATRIX@ )
1413
set( ALGEBRA_PLUGINS_INCLUDE_VC @ALGEBRA_PLUGINS_INCLUDE_VC@ )
15-
set( ALGEBRA_PLUGINS_INCLUDE_VECMEM @ALGEBRA_PLUGINS_INCLUDE_VECMEM@ )
1614

1715
# Set up some simple variables for using the package.
1816
set( algebra_plugins_VERSION "@PROJECT_VERSION@" )
@@ -25,15 +23,9 @@ include( CMakeFindDependencyMacro )
2523
if( ALGEBRA_PLUGINS_INCLUDE_EIGEN )
2624
find_dependency( Eigen3 )
2725
endif()
28-
if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
29-
find_dependency( ROOT COMPONENTS Smatrix )
30-
endif()
3126
if( ALGEBRA_PLUGINS_INCLUDE_VC )
3227
find_dependency( Vc 1.4.2 )
3328
endif()
34-
if( ALGEBRA_PLUGINS_INCLUDE_VECMEM )
35-
find_dependency( vecmem )
36-
endif()
3729

3830
# Print a standard information message about the package being found.
3931
include( FindPackageHandleStandardArgs )

extern/vecmem/CMakeLists.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

extern/vecmem/README.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

frontend/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,11 @@
88
add_subdirectory( array_cmath )
99

1010
if( ALGEBRA_PLUGINS_INCLUDE_EIGEN )
11-
add_subdirectory( eigen_generic )
1211
add_subdirectory( eigen_eigen )
1312
endif()
1413

15-
if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
16-
add_subdirectory( smatrix_generic )
17-
add_subdirectory( smatrix_smatrix )
18-
endif()
19-
2014
if( ALGEBRA_PLUGINS_INCLUDE_VC )
2115
add_subdirectory( vc_aos )
22-
add_subdirectory( vc_aos_generic )
2316
if( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" )
2417
add_subdirectory( vc_soa )
2518
endif()
@@ -28,7 +21,3 @@ endif()
2821
if( ALGEBRA_PLUGINS_INCLUDE_FASTOR )
2922
add_subdirectory( fastor_fastor )
3023
endif()
31-
32-
if( ALGEBRA_PLUGINS_INCLUDE_VECMEM )
33-
add_subdirectory( vecmem_cmath )
34-
endif()

frontend/eigen_generic/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

frontend/eigen_generic/include/algebra/eigen_generic.hpp

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)